[pLog-svn] r3444 - in plog/trunk: styles templates/admin templates/summary

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Sat May 20 13:18:43 GMT 2006


Author: jondaley
Date: 2006-05-20 13:18:42 +0000 (Sat, 20 May 2006)
New Revision: 3444

Modified:
   plog/trunk/styles/admin.css
   plog/trunk/styles/summary.css
   plog/trunk/templates/admin/editblog.template
   plog/trunk/templates/summary/index.template
Log:
fixing various bugs that were causing the html/css to not validate

Modified: plog/trunk/styles/admin.css
===================================================================
--- plog/trunk/styles/admin.css	2006-05-20 12:28:30 UTC (rev 3443)
+++ plog/trunk/styles/admin.css	2006-05-20 13:18:42 UTC (rev 3444)
@@ -313,7 +313,7 @@
 
 .menuTop_level1 ul, li
 {
-    list-decoration: none;
+/*    list-decoration: none;*/
 }
 
 .menuTop_level1 ul
@@ -374,8 +374,8 @@
 
 .list_action_button a:hover img
 {
-    filter            : alpha(opacity=60);
-    -moz-opacity      : 0.6;
+/*    filter            : alpha(opacity=60);
+    -moz-opacity      : 0.6;*/
 }
 
 .field

Modified: plog/trunk/styles/summary.css
===================================================================
--- plog/trunk/styles/summary.css	2006-05-20 12:28:30 UTC (rev 3443)
+++ plog/trunk/styles/summary.css	2006-05-20 13:18:42 UTC (rev 3444)
@@ -359,8 +359,8 @@
 
 .list_action_button a:hover img
 {
-    filter            : alpha(opacity=60);
-    opacity           : 0.6;
+/*    filter            : alpha(opacity=60);
+    opacity           : 0.6; */
 }
 
 .field
@@ -814,4 +814,4 @@
 div.templateScreen {
   float: left;
   margin: 5px 15px 15px 0px;
-}
\ No newline at end of file
+}

Modified: plog/trunk/templates/admin/editblog.template
===================================================================
--- plog/trunk/templates/admin/editblog.template	2006-05-20 12:28:30 UTC (rev 3443)
+++ plog/trunk/templates/admin/editblog.template	2006-05-20 13:18:42 UTC (rev 3444)
@@ -1,16 +1,16 @@
 {include file="$admintemplatepath/header.template"}
 {include file="$admintemplatepath/navigation.template" showOpt=editSiteBlogs title=$locale->tr("editBlog")}
 
- <form name="blogSettings" action="admin.php" method="post" onSubmit="listSelectAll('userList');">
+ <form name="blogSettings" action="admin.php" method="post" onsubmit="listSelectAll('userList');">
    <fieldset class="inputField">
     <legend>{$locale->tr("editBlog")}</legend>
 	{include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_settings")}
     <div class="field">
-      <label for="blogLink">{$locale->tr("blog_link")}</label>
+      <label for="ro_blogLink">{$locale->tr("blog_link")}</label>
       <span class="required"></span>
       <div class="formHelp">{$locale->tr("blog_link_help")}</div>
       {assign var=editBlogUrlGenerator value=$editblog->getBlogRequestGenerator()} 
-      <input style="width:100%" type="text" readonly="readonly" id="blogLink" name="blogLink" class="readOnly" value="{$editBlogUrlGenerator->blogLink()}" />
+      <input style="width:100%" type="text" readonly="readonly" id="ro_blogLink" name="ro_blogLink" class="readOnly" value="{$editBlogUrlGenerator->blogLink()}" />
     </div>
 
     <div class="field">
@@ -126,16 +126,16 @@
     </div>
 
     <div class="field">
-	<label for="">{$locale->tr("users")}</label>
+	<label for="blog_users">{$locale->tr("users")}</label>
         <div class="formHelp">{$locale->tr("blog_users_help")}</div>
 	  <select id="userList" name="blogUsers[]" size="10" multiple="multiple" style="width:40%">
 	   {foreach from=$blogusers item=bloguser}
 	    <option value="{$bloguser->getId()}">{$bloguser->getUsername()}</option>
 	   {/foreach}
 	  </select><br/>
-	  <a name="blogselect" href="#blogselect" onclick="window.open('?op=siteUsersChooser&amp;mode=2','UserChooser','scrollbars=yes,resizable=yes,toolbar=no,height=450,width=600');">{$locale->tr("add")}</a>
+	  <a name="blog_users" href="#blog_users" onclick="window.open('?op=siteUsersChooser&amp;mode=2','UserChooser','scrollbars=yes,resizable=yes,toolbar=no,height=450,width=600');">{$locale->tr("add")}</a>
 	   | 
-	  <a href="#blogselect" onclick="editBlogRemoveSelected()">
+	  <a href="#blog_users" onclick="editBlogRemoveSelected()">
    	    {$locale->tr("remove_selected")}
 	  </a>
        </div>

Modified: plog/trunk/templates/summary/index.template
===================================================================
--- plog/trunk/templates/summary/index.template	2006-05-20 12:28:30 UTC (rev 3443)
+++ plog/trunk/templates/summary/index.template	2006-05-20 13:18:42 UTC (rev 3444)
@@ -18,33 +18,30 @@
 	    <a href="?op=resetPasswordForm">{$locale->tr("password_forgotten")}</a>		
     </fieldset>
     </form>
-    <h4>{$locale->tr("summary_newest_blogs")}
     {assign var=recentBlogs value=$summaryStats->getRecentBlogs()}
-    {if $recentBlogs}
+    <h4>{$locale->tr("summary_newest_blogs")}
       <a href="{$url->getRssUrl()}?summary=1&amp;type=newestblogs">
         <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" 
-         alt="RSS" /></a>    
-    {/if}
+           alt="RSS" /></a>    
     </h4>
-    <ul class="itemList">
-    {foreach from=$recentBlogs item=blog}
-        {assign var="url" value=$blog->getBlogRequestGenerator()}
-		{** remove this if you're having problems with blogs in encondings other than iso-8859-1 **}
-        <li class="item"><a href="{$url->blogLink()}">{$blog->getBlog()|strip_tags}</a></li>
-    {/foreach}
-    </ul>
+    {if $recentBlogs}
+      <ul class="itemList">
+        {foreach from=$recentBlogs item=blog}
+          {assign var="url" value=$blog->getBlogRequestGenerator()}
+		  {** remove this if you're having problems with blogs in encondings other than iso-8859-1 **}
+          <li class="item"><a href="{$url->blogLink()}">{$blog->getBlog()|strip_tags}</a></li>
+        {/foreach}
+      </ul>
+    {/if}
 </div>
 
 <div id="maincolumn">
     <div id="intro">
         <h4>{$locale->tr("summary_welcome")}</h4>
-		You should place here whatever welcome message you would like your users to see. Or remove
-		this one completely and rearrange the whole page. Or something :) Take a look at
-		templates/summary, that is where all template files that make up this page are stored. You are
-		free to change them in any way you like.
+        {$locale->tr("summary_welcome_paragraph")}
     </div>
 	<br/>
-    <div id="intro">
+    <div id="global_article_categories">
 	<h4>{$locale->tr("global_article_categories")}</h4>
 	<span class="tag"><a href="?op=Summary&amp;globalArticleCategoryId=0">{$locale->tr("all")}</a></span>
 	{foreach from=$globalArticleCategories item=globalArticleCategory}
@@ -65,7 +62,7 @@
         </div>
         <div class="field">
             <label for="searchType">{$locale->tr("search_type")}</label><br />
-	   	    <select name="searchType" id="searchType"">
+	   	    <select name="searchType" id="searchType">
 	    	   	<option value="1">{$locale->tr("post")}</option>
 	    	   	<option value="2">{$locale->tr("blog")}</option>
 	    	   	<option value="3">{$locale->tr("resource")}</option>
@@ -77,62 +74,53 @@
     </form>	
     <h4>{$locale->tr("summary_most_active_blogs")}
     {assign var=activeBlogs value=$summaryStats->getMostActiveBlogs()}
-    {if $activeBlogs}
       <a href="{$url->getRssUrl()}?summary=1&amp;type=mostactiveblogs">
         <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" 
          alt="RSS" /></a>    
-    {/if}
     </h4>
-    <ul class="itemList">
-    {foreach from=$activeBlogs item=blog}
-	    {assign var="url" value=$blog->getBlogRequestGenerator()}
-        <li class="item"><a href="{$url->blogLink()}">{$blog->getBlog()|strip_tags}</a></li>
-    {/foreach}
-    </ul>
+    {if $activeBlogs}
+      <ul class="itemList">
+        {foreach from=$activeBlogs item=blog}
+	      {assign var="url" value=$blog->getBlogRequestGenerator()}
+          <li class="item"><a href="{$url->blogLink()}">{$blog->getBlog()|strip_tags}</a></li>
+        {/foreach}
+      </ul>
+    {/if}
 
     <h4>{$locale->tr("summary_most_commented_articles")}
     {assign var=commentedPosts value=$summaryStats->getMostCommentedArticles()}
-    {if $commentedPosts} 
       <a href="{$url->getRssUrl()}?summary=1&amp;type=mostcommented">
         <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" 
          alt="RSS" /></a>
-    {/if}    
-
 	</h4>
-    {foreach name=commented from=$commentedPosts item=post}
-       {if $smarty.foreach.commented.first}
-         <ul class="itemList">
-       {/if}
-	    {assign var="blog" value=$post->getBlogInfo()}
-	    {assign var="url" value=$blog->getBlogRequestGenerator()}	
-        <li class="item">		
+    {if $commentedPosts} 
+      <ul class="itemList">
+        {foreach name=commented from=$commentedPosts item=post}
+	      {assign var="blog" value=$post->getBlogInfo()}
+	      {assign var="url" value=$blog->getBlogRequestGenerator()}	
+          <li class="item">		
             <a href="{$url->postPermalink($post)}">{$post->getTopic()|strip_tags}</a> ({$post->getTotalComments()})<br />
-        </li>
-       {if $smarty.foreach.commented.last}
-         </ul>
-       {/if}
-    {/foreach}
+          </li>
+        {/foreach}
+      </ul>
+    {/if}    
 
     <h4>{$locale->tr("summary_most_read_articles")}
       {assign var=readestBlogs value=$summaryStats->getMostReadArticles()}
-      {if $readestBlogs}
         <a href="{$url->getRssUrl()}?summary=1&amp;type=mostread">
           <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" 
           alt="RSS" /></a>		
-      {/if}
      </h4>
-    {foreach name=readest from=$readestBlogs item=post}
-       {if $smarty.foreach.readest.first}
-         <ul class="itemList">
-       {/if}
-	    {assign var="blog" value=$post->getBlogInfo()}
-	    {assign var="url" value=$blog->getBlogRequestGenerator()}		
-        <li class="item">
-            <a href="{$url->postPermalink($post)}">{$post->getTopic()|strip_tags}</a> ({$post->getNumReads()})<br />
-        </li>
-       {if $smarty.foreach.readest.last}
-         </ul>
-       {/if}
-    {/foreach}
+      {if $readestBlogs}
+        <ul class="itemList">
+          {foreach name=readest from=$readestBlogs item=post}
+            {assign var="blog" value=$post->getBlogInfo()}
+	        {assign var="url" value=$blog->getBlogRequestGenerator()}		
+            <li class="item">
+              <a href="{$url->postPermalink($post)}">{$post->getTopic()|strip_tags}</a> ({$post->getNumReads()})<br />
+           </li>
+          {/foreach}
+        </ul>
+      {/if}
 </div>
-{include file="summary/footer.template"}
\ No newline at end of file
+{include file="summary/footer.template"}



More information about the pLog-svn mailing list