[KMess-commits] SF.net SVN: kmess:[4718] trunk/likeback

[<da...@us...>]

Revision: 4718
          http://kmess.svn.sourceforge.net/kmess/?rev=4718&view=rev
Author:   dazjorz
Date:     2009-04-29 10:36:12 +0000 (Wed, 29 Apr 2009)

Log Message:
-----------
* Removed the subBar() function from functions.inc.php.
* Made the code in view.php a little more clear.

Modified Paths:
--------------
    trunk/likeback/ChangeLog
    trunk/likeback/admin/comment.php
    trunk/likeback/admin/functions.php
    trunk/likeback/admin/options.php
    trunk/likeback/admin/templates/html/lbsubbar.tpl
    trunk/likeback/admin/view.php

Modified: trunk/likeback/ChangeLog
===================================================================
--- trunk/likeback/ChangeLog	2009-04-29 10:25:33 UTC (rev 4717)
+++ trunk/likeback/ChangeLog	2009-04-29 10:36:12 UTC (rev 4718)
@@ -7,6 +7,8 @@
  * The locale cell is now further away from the type cell on the settings
  page, "all other locales" is above all locales and there's a <hr/> dividing "all
  others" and the list of locales.
+ * Removed the subBar() function from functions.inc.php.
+ * Made the code in view.php a little more clear.
 
 2009-04-28 (dazjorz)
  * Fixed stats.php to make a list of all types, sorted by the order as

Modified: trunk/likeback/admin/comment.php
===================================================================
--- trunk/likeback/admin/comment.php	2009-04-29 10:25:33 UTC (rev 4717)
+++ trunk/likeback/admin/comment.php	2009-04-29 10:36:12 UTC (rev 4718)
@@ -44,7 +44,9 @@
 
   $subBarContents = '<a href="view.php?useSessionFilter=true' . $page . '#comment_' . $comment->id . '"><img src="icons/gohome.png" width="32" height="32" alt="Go home"/></a>'."\n";
   $subBarContents .= ' &nbsp; &nbsp;' . iconForType( $comment->type ) . ' ' . messageForType( $comment->type ) . ' &nbsp; #<strong>' . $comment->id . '</strong> &nbsp; &nbsp; ' . $comment->date;
-  echo subBar( $comment->type, $subBarContents );
+  $smarty->assign( 'subBarType',     $comment->type );
+  $smarty->assign( 'subBarContents', $subBarContents );
+  $smarty->display( 'html/lbsubbar.tpl' );
 
   if( isset( $_POST['newRemark'] ) )
   {

Modified: trunk/likeback/admin/functions.php
===================================================================
--- trunk/likeback/admin/functions.php	2009-04-29 10:25:33 UTC (rev 4717)
+++ trunk/likeback/admin/functions.php	2009-04-29 10:36:12 UTC (rev 4718)
@@ -234,15 +234,6 @@
   return $smarty;
 }
 
-// todo move this
-function subBar( $type, $contents = "" )
-{
-  $smarty = getSmartyObject();
-  $smarty->assign( 'commentType', $type );
-  $smarty->assign( 'contents', $contents );
-  $smarty->display( 'html/lbsubbar.tpl' );
-}
-
 // Returns the current developer if someone is logged in
 function getDeveloper() {
   global $developer;

Modified: trunk/likeback/admin/options.php
===================================================================
--- trunk/likeback/admin/options.php	2009-04-29 10:25:33 UTC (rev 4717)
+++ trunk/likeback/admin/options.php	2009-04-29 10:36:12 UTC (rev 4718)
@@ -63,7 +63,9 @@
 
 $subBarContents = '<a href="view.php?useSessionFilter=true"><img src="icons/gohome.png" width="32" height="32" alt=""></a> &nbsp; &nbsp;
    <strong><img src="icons/email.png" width="16" height="16" alt="E-mail" /> E-Mail Options</strong> &nbsp; &nbsp; '.$developer->login;
-echo subBar( 'Options', $subBarContents );
+$smarty->assign( 'subBarType',     'Options' );
+$smarty->assign( 'subBarContents', $subBarContents );
+$smarty->display( 'html/lbsubbar.tpl' );
 
 $likeChecked    = (matchType($developer->types, "Like")    ? 'checked="checked"' : "");
 $dislikeChecked = (matchType($developer->types, "Dislike") ? 'checked="checked"' : "");

Modified: trunk/likeback/admin/templates/html/lbsubbar.tpl
===================================================================
--- trunk/likeback/admin/templates/html/lbsubbar.tpl	2009-04-29 10:25:33 UTC (rev 4717)
+++ trunk/likeback/admin/templates/html/lbsubbar.tpl	2009-04-29 10:36:12 UTC (rev 4718)
@@ -1,6 +1,4 @@
-{* todo remove this later *}
-{if $contents && !$subBarContents}{assign var=subBarContents value="$contents"}{/if}
-{if $commentType && !$subBarType }{assign var=subBarType     value="$commentType}{/if}
+  
   <div class="subBar {$subBarType}">
     {$subBarContents}
   </div>

Modified: trunk/likeback/admin/view.php
===================================================================
--- trunk/likeback/admin/view.php	2009-04-29 10:25:33 UTC (rev 4717)
+++ trunk/likeback/admin/view.php	2009-04-29 10:36:12 UTC (rev 4718)
@@ -29,11 +29,18 @@
   $filtering = isset($_POST['filtering']);
 
   // Gather the versions and version filter
-  $versionFilter = (isset($_POST["version"]) ? substr( maybeStrip( $_POST["version"] ), 8) : ""); // TODO remove substr() for 1.2
+  $versionFilter = (isset($_POST["version"]) ? maybeStrip( $_POST["version"] ) : "");
+
+  // remove version_
+  if( substr( $versionFilter, 0, 8 ) == "version_" )
+    $versionFilter = substr( $versionFilter, 8 );
+
   if( $versionFilter == "*" )
     $versionFilter = "";
+
   $versions = db_fetchAll("SELECT version FROM LikeBack WHERE version!='' GROUP BY version ORDER BY date DESC");
 
+
   // Gather the locales and locale filter
   $localesFilter = array();
   $locales = db_fetchAll("SELECT locale FROM LikeBack WHERE locale!='' GROUP BY locale ORDER BY locale ASC");
@@ -148,7 +155,9 @@
 
 $smarty->display( 'html/lbheader.tpl' );
 $subBarContents = '<span id="countMessage">Number of displayed comments: <strong id="commentCount">' . count($comments). '</strong></span>';
-echo subBar( 'Options', $subBarContents );
+$smarty->assign( 'subBarType',     'Options' );
+$smarty->assign( 'subBarContents', $subBarContents );
+$smarty->display( 'html/lbsubbar.tpl' );
 
 echo '<div class="content">';
 $smarty->display( 'html/viewfilters.tpl' );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.