[pLog-svn] r4657 - templates/branches/lifetype-1.2/greenmarinee

Thu Feb 1 17:25:34 EST 2007

 	They should be in the unported folder until they are ready to be 
released right?  Are you saying that it is organizationally hard to keep 
track of, or that it is wasteful to have multiple copies of everything 
everywhere?  subversion doesn't care, and does it efficiently.
 	It seems like it is harder to find stuff if each plugin is in its 
own directory.  I personally have a .all-1.1 directory in my templates and 
plugins folder, and I can go find stuff when I need it.  And when I am 
bored, I can go poke through the unported folder, and work on things.

On Thu, 1 Feb 2007, Reto Hugi wrote:
> I'm not very happy with having all templates in the 1.2 branch folder
> despite only one really beeing ready for lt 1.2.  Usually we where
> moving templates and plugins to an "unported" folder until they where
> ready. But having seperate branches for releases leaves a lot of copies
> around, most of them unchanged (lifetype-1.1.5/blix is probably the same
> as trunk/blix and lifetype-1.2/blix etc)
>
> my suggestion:
> a) switching structure for templates and plugins to:
> plugins/<plugin-name>/trunk
> plugins/<plugin-name>/branches
> plugins/<plugin-name>/tags
>
> b) removing all templates from branches/lt-1.2 that don't make use of
> 1.2 features.
>
> what do you think?
>
> On 02/01/2007 11:10 PM, reto at devel.lifetype.net wrote:
>> Author: reto
>> Date: 2007-02-01 17:10:05 -0500 (Thu, 01 Feb 2007)
>> New Revision: 4657
>>
>> Added:
>>    templates/branches/lifetype-1.2/greenmarinee/commentform.template
>> Modified:
>>    templates/branches/lifetype-1.2/greenmarinee/main.template
>>    templates/branches/lifetype-1.2/greenmarinee/post.template
>>    templates/branches/lifetype-1.2/greenmarinee/postandcomments.template
>> Log:
>> ported to work with 1.2 paging and form authentication (no plugins)
>>
>>
>> Added: templates/branches/lifetype-1.2/greenmarinee/commentform.template
>> ===================================================================
>> --- templates/branches/lifetype-1.2/greenmarinee/commentform.template	                        (rev 0)
>> +++ templates/branches/lifetype-1.2/greenmarinee/commentform.template	2007-02-01 22:10:05 UTC (rev 4657)
>> @@ -0,0 +1,28 @@
>> +<div class="postinput">
>> +  <form action="{$url->getIndexUrl()}" method="post">
>> +        <div>
>> +{dynamic}
>> +	<input tabindex="1" id="subject" name="commentTopic" value="{$topic}" />
>> +	<label for="subject"><small>{$locale->tr("comment_topic")}</small></label><br /><br />
>> +	{if $authuser}
>> +		<input tabindex="2" id="author" name="userName" value="{$authuser->getUsername()}" readonly="readonly" />
>> +		<label for="author"><small>{$locale->tr("comment_username")} (<b>{$locale->tr("form_authenticated")}</b>)</small></label><br /><br />
>> +	{else}
>> +	    <input tabindex="2" id="author" name="userName" value="{$authuser->getUsername()}" />
>> +		<label for="author"><small>{$locale->tr("comment_username")}</small></label><br /><br />
>> +	{/if}
>> +	<input tabindex="3" id="email" name="userEmail" />
>> +	<label for="email"><small>{$locale->tr("comment_email")}</small></label><br /><br />
>> +	<input tabindex="4" id="url" name="userUrl" />
>> +	<label for="url"><small>{$locale->tr("comment_url")}</small></label><br /><br />
>> +{/dynamic}
>> +  <textarea tabindex="5" id="text" name="commentText" rows="10" cols="50"></textarea><br /><br />
>> +  <input style="font-weight: bold;" type="submit" name="post" value="&nbsp;{$locale->tr("comment_send")}&nbsp;" /><br /><br />
>> +  <input type="hidden" name="op" value="AddComment"/>
>> +  <input type="hidden" name="articleId" value="{$post->getId()}"/>
>> +  <input type="hidden" name="blogId" value="{$blog->getId()}"/>
>> +  <input type="hidden" name="parentId" value="{$parentId}"/>
>> +
>> +  </div>
>> +  </form>
>> +</div>
>>
>> Modified: templates/branches/lifetype-1.2/greenmarinee/main.template
>> ===================================================================
>> --- templates/branches/lifetype-1.2/greenmarinee/main.template	2007-02-01 21:31:41 UTC (rev 4656)
>> +++ templates/branches/lifetype-1.2/greenmarinee/main.template	2007-02-01 22:10:05 UTC (rev 4657)
>> @@ -1,4 +1,4 @@
>> -
>> +{assign var="OnMainPage" value=1}
>>  {include file="$blogtemplate/header.template"}
>>  {include file="$blogtemplate/panel.template"}
>>  <div id="content">
>>
>> Modified: templates/branches/lifetype-1.2/greenmarinee/post.template
>> ===================================================================
>> --- templates/branches/lifetype-1.2/greenmarinee/post.template	2007-02-01 21:31:41 UTC (rev 4656)
>> +++ templates/branches/lifetype-1.2/greenmarinee/post.template	2007-02-01 22:10:05 UTC (rev 4657)
>> @@ -1,5 +1,7 @@
>>  {assign var="postDate" value=$post->getDateObject()}
>>  {assign var="postOwner" value=$post->getUserInfo()}
>> +{assign var=nextpost value=$post->getNextArticle()}
>> +{assign var=prevpost value=$post->getPrevArticle()}
>>  <div>
>>   <h2>{$post->getTopic()}</h2>
>>  <div class="meta">{$locale->tr("posted_by")} {$postOwner->getUsername()}  {$locale->tr("in")}
>> @@ -17,6 +19,13 @@
>>     <a href="{$url->postPermalink($post)}">{$locale->tr("permalink")}</a> /
>>     <a href="{$url->postPermalink($post)}">({$post->getTotalComments()}) {$locale->tr("comments")} </a> /
>>     <a href="{$url->postTrackbackStatsLink($post)}">({$post->getTotalTrackbacks()}) {$locale->tr("trackbacks")} </a>
>> -   <?php echo "$url" ?>
>> +   {if !$OnMainPage}
>> +   {if $nextpost == true}
>> +   / <a href="{$url->postPermalink($nextpost)}" title="{$locale->tr("next_post")}: {$nextpost->getTopic()}">{$locale->tr("next_post")}</a>
>> +   {/if}
>> +    {if $prevpost == true}
>> +    / <a href="{$url->postPermalink($prevpost)}" title="{$locale->tr("previous_post")}: {$prevpost->getTopic()}">{$locale->tr("previous_post")}</a>
>> +    {/if}
>> +    {/if}
>>  </div>
>> -</div>
>> \ No newline at end of file
>> +</div>
>>
>> Modified: templates/branches/lifetype-1.2/greenmarinee/postandcomments.template
>> ===================================================================
>> --- templates/branches/lifetype-1.2/greenmarinee/postandcomments.template	2007-02-01 21:31:41 UTC (rev 4656)
>> +++ templates/branches/lifetype-1.2/greenmarinee/postandcomments.template	2007-02-01 22:10:05 UTC (rev 4657)
>> @@ -11,9 +11,10 @@
>>   {include file="$blogtemplate/post.template"}
>>
>>   <div>
>> +
>>   {if $post->getComments()}
>>   <ol class="commentlist">
>> - {foreach from=$post->getComments() item=comment}
>> + {foreach from=$comments item=comment}
>>    <li class={$oddcomment}>
>>      <div class="comment_author">
>>        {if $comment->getUserUrl() != ""}
>> @@ -36,8 +37,10 @@
>>    {/foreach}
>>   </ol>
>>   {/if}
>> +  {pager style="links"}
>>   </div>
>>
>> +
>>   {if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
>>    <div>
>>     <div>{$locale->tr("add_comment")}</div>
>>
>> _______________________________________________
>> pLog-svn mailing list
>> pLog-svn at devel.lifetype.net
>> http://limedaley.com/mailman/listinfo/plog-svn
>
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.lifetype.net
> http://limedaley.com/mailman/listinfo/plog-svn
>

-- 
Jon Daley
http://jon.limedaley.com/

"Diplomacy" is letting them have it your way.