Thread: [Isocial-svn] SF.net SVN: isocial: [33]

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 33
          http://isocial.svn.sourceforge.net/isocial/?rev=33&view=rev
Author:   aguidrevitch
Date:     2008-02-29 02:19:57 -0800 (Fri, 29 Feb 2008)

Log Message:
-----------
sharing errors, sidebar, pageheader templates

Modified Paths:
--------------
    app/application_controller.php
    app/controllers/user_controller.php
    app/views/user/confirm.tpl
    app/views/user/forgot_password.tpl
    app/views/user/login.tpl
    app/views/user/register.tpl
    app/views/user/reset_password.tpl
    config/DEFAULT-config.php

Added Paths:
-----------
    app/views/shared/
    app/views/shared/compiled/
    app/views/shared/compiled/errors.tpl.php
    app/views/shared/default/
    app/views/shared/default/compiled/
    app/views/shared/default/compiled/pageheader.tpl.php
    app/views/shared/default/compiled/sidebar.tpl.php
    app/views/shared/default/pageheader.tpl
    app/views/shared/default/sidebar.tpl
    app/views/shared/errors.tpl
    app/views/shared/loggedin/
    app/views/shared/loggedin/compiled/
    app/views/shared/loggedin/compiled/pageheader.tpl.php
    app/views/shared/loggedin/compiled/sidebar.tpl.php
    app/views/shared/loggedin/pageheader.tpl
    app/views/shared/loggedin/sidebar.tpl

Removed Paths:
-------------
    app/views/default/_pageheader.tpl
    app/views/default/_sidebar.tpl
    app/views/user/_errors.tpl
    app/views/user/_pageheader.tpl
    app/views/user/_pageheader_loggedin.tpl
    app/views/user/_sidebar.tpl
    app/views/user/_sidebar_loggedin.tpl

Modified: app/application_controller.php
===================================================================

--- app/application_controller.php	2008-02-26 11:33:47 UTC (rev 32)
+++ app/application_controller.php	2008-02-29 10:19:57 UTC (rev 33)
@@ -138,14 +138,24 @@
         return $this->_errors;
     }
     
+    function renderShared ( $template )
+    {
+        return $this->render(array('template' => AK_VIEWS_DIR . DS . "shared/$template" , 'layout' => false, 'partial' => true));
+    }
+    
+    function renderErrors ()
+    {
+        return $this->renderShared("errors");
+    }
+    
     function renderSidebar() 
     {
-        return $this->renderPartial("sidebar");
+        return $this->renderShared("default/sidebar");
     }
     
     function renderPageHeader()
     {
-        return $this->renderPartial("pageheader");
+        return $this->renderShared("default/pageheader");
     }
     
     function _fix_email ($value) {

Modified: app/controllers/user_controller.php
===================================================================
--- app/controllers/user_controller.php	2008-02-26 11:33:47 UTC (rev 32)
+++ app/controllers/user_controller.php	2008-02-29 10:19:57 UTC (rev 33)
@@ -150,14 +150,14 @@
 
     function renderSidebar () {
         if ($this->current_user) {
-            return $this->renderPartial("sidebar_loggedin");
+            return $this->renderShared("loggedin/sidebar");
         }
         return parent::renderSidebar();
     }
 
     function renderPageHeader () {
         if ($this->current_user) {
-            return $this->renderPartial("pageheader_loggedin");
+            return $this->renderShared("loggedin/pageheader");
         }
         return parent::renderPageHeader();
     }

Deleted: app/views/default/_pageheader.tpl
===================================================================
--- app/views/default/_pageheader.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/default/_pageheader.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -1,3 +0,0 @@
-<ul id="headermenuright">
-  <li><a href="/user/login">_{Login}</a></li>
-</ul>
\ No newline at end of file

Deleted: app/views/default/_sidebar.tpl
===================================================================
--- app/views/default/_sidebar.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/default/_sidebar.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -1,20 +0,0 @@
-<div id="quicklogin">
-  <form action="/user/login" method="post">
-    <label>
-       <span>_{Email}:</span>
-       <input class="textinput" type="text" name="email">
-    </label>
-    <label>
-       <span>_{Password}:</span>
-       <input class="textinput" type="password" name="password">
-    </label>
-    <label class="persistent">
-       <input class="checkboxinput" type="checkbox" name="remember_me">
-       <span>_{Remember me}</span>
-    </label>
-    <input class="submitinput" type="submit" value="_{Login}">
-
-  </form>
-  
-  <a href="/user/forgot_password">_{Forgot Password?}</a>
-</div>
\ No newline at end of file

Added: app/views/shared/compiled/errors.tpl.php
===================================================================
--- app/views/shared/compiled/errors.tpl.php	                        (rev 0)
+++ app/views/shared/compiled/errors.tpl.php	2008-02-29 10:19:57 UTC (rev 33)
@@ -0,0 +1,14 @@
+<?php if (count($controller->getErrors())) {
+  foreach ($controller->getErrors() as $field => $values) {
+    foreach ($values as $value) {
+      echo '<div class="error">';
+      echo '<h1>' . $value[0] . '</h1>';
+      if (isset($value[1])) {
+        echo '<p>' . $value[1] . '</p>';
+      }
+      echo '</div>';
+    }
+    break;
+  }
+}
+?>

Added: app/views/shared/default/compiled/pageheader.tpl.php
===================================================================
--- app/views/shared/default/compiled/pageheader.tpl.php	                        (rev 0)
+++ app/views/shared/default/compiled/pageheader.tpl.php	2008-02-29 10:19:57 UTC (rev 33)
@@ -0,0 +1,3 @@
+<ul id="headermenuright">
+  <li><a href="/user/login"><?php echo $text_helper->translate('Login', array()); ?></a></li>
+</ul>
\ No newline at end of file

Added: app/views/shared/default/compiled/sidebar.tpl.php
===================================================================
--- app/views/shared/default/compiled/sidebar.tpl.php	                        (rev 0)
+++ app/views/shared/default/compiled/sidebar.tpl.php	2008-02-29 10:19:57 UTC (rev 33)
@@ -0,0 +1,4 @@
+<div id="quicklogin">
+  <?php echo $text_helper->translate('Everyone Can Join', array()); ?>
+<a class="linkbutton" href="/user/register"><div><?php echo $text_helper->translate('Sign Up', array()); ?></div></a>
+</div>
\ No newline at end of file

Added: app/views/shared/default/pageheader.tpl
===================================================================
--- app/views/shared/default/pageheader.tpl	                        (rev 0)
+++ app/views/shared/default/pageheader.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -0,0 +1,3 @@
+<ul id="headermenuright">
+  <li><a href="/user/login">_{Login}</a></li>
+</ul>
\ No newline at end of file

Added: app/views/shared/default/sidebar.tpl
===================================================================
--- app/views/shared/default/sidebar.tpl	                        (rev 0)
+++ app/views/shared/default/sidebar.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -0,0 +1,4 @@
+<div id="quicklogin">
+  _{Everyone Can Join}
+<a class="linkbutton" href="/user/register"><div>_{Sign Up}</div></a>
+</div>
\ No newline at end of file

Added: app/views/shared/errors.tpl
===================================================================
--- app/views/shared/errors.tpl	                        (rev 0)
+++ app/views/shared/errors.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -0,0 +1,15 @@
+<?
+if (count($controller->getErrors())) {
+  foreach ($controller->getErrors() as $field => $values) {
+    foreach ($values as $value) {
+      echo '<div class="error">';
+      echo '<h1>' . $value[0] . '</h1>';
+      if (isset($value[1])) {
+        echo '<p>' . $value[1] . '</p>';
+      }
+      echo '</div>';
+    }
+    break;
+  }
+}
+?>

Added: app/views/shared/loggedin/compiled/pageheader.tpl.php
===================================================================
--- app/views/shared/loggedin/compiled/pageheader.tpl.php	                        (rev 0)
+++ app/views/shared/loggedin/compiled/pageheader.tpl.php	2008-02-29 10:19:57 UTC (rev 33)
@@ -0,0 +1,8 @@
+<ul id="headermenuleft">
+  <li><a class="globallink" href="/profile/"><?php echo $text_helper->translate('Profile', array()); ?></a> <a href="/profile/edit"><?php echo $text_helper->translate('edit', array()); ?></a></li>
+  <li><a class="globallink" href="/friend/"><?php echo $text_helper->translate('Friends', array()); ?></a></li>
+  <li><a class="globallink" href="/message/"><?php echo $text_helper->translate('Inbox', array()); ?> (0)</a></li>
+</ul>
+<ul id="headermenuright">
+  <li><a href="/user/logout"><?php echo $text_helper->translate('Logout', array()); ?></a></li>
+</ul>
\ No newline at end of file

Added: app/views/shared/loggedin/compiled/sidebar.tpl.php
===================================================================
--- app/views/shared/loggedin/compiled/sidebar.tpl.php	                        (rev 0)
+++ app/views/shared/loggedin/compiled/sidebar.tpl.php	2008-02-29 10:19:57 UTC (rev 33)
@@ -0,0 +1,18 @@
+<div id="qsearch">
+  <div>
+    <h2>Search</h2>
+  </div>
+  <form action="/search">
+     <div id="qsearchwrapper">
+       <div id="qsearchfield">
+         <input id="query" name="query" type="text" class="textinput">
+       </div>
+       <div id="qsearchimage">a
+       </div>
+     </div>
+  </form>
+</div>
+<div id="applications">
+  <div>Photos</div>
+  <div>Groups</div>
+</div>
\ No newline at end of file

Added: app/views/shared/loggedin/pageheader.tpl
===================================================================
--- app/views/shared/loggedin/pageheader.tpl	                        (rev 0)
+++ app/views/shared/loggedin/pageheader.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -0,0 +1,8 @@
+<ul id="headermenuleft">
+  <li><a class="globallink" href="/profile/">_{Profile}</a> <a href="/profile/edit">_{edit}</a></li>
+  <li><a class="globallink" href="/friend/">_{Friends}</a></li>
+  <li><a class="globallink" href="/message/">_{Inbox} (0)</a></li>
+</ul>
+<ul id="headermenuright">
+  <li><a href="/user/logout">_{Logout}</a></li>
+</ul>
\ No newline at end of file

Added: app/views/shared/loggedin/sidebar.tpl
===================================================================
--- app/views/shared/loggedin/sidebar.tpl	                        (rev 0)
+++ app/views/shared/loggedin/sidebar.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -0,0 +1,18 @@
+<div id="qsearch">
+  <div>
+    <h2>Search</h2>
+  </div>
+  <form action="/search">
+     <div id="qsearchwrapper">
+       <div id="qsearchfield">
+         <input id="query" name="query" type="text" class="textinput">
+       </div>
+       <div id="qsearchimage">a
+       </div>
+     </div>
+  </form>
+</div>
+<div id="applications">
+  <div>Photos</div>
+  <div>Groups</div>
+</div>
\ No newline at end of file

Deleted: app/views/user/_errors.tpl
===================================================================
--- app/views/user/_errors.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/user/_errors.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -1,15 +0,0 @@
-<?
-if (count($controller->getErrors())) {
-  foreach ($controller->getErrors() as $field => $values) {
-    foreach ($values as $value) {
-      echo '<div class="error">';
-      echo '<h1>' . $value[0] . '</h1>';
-      if (isset($value[1])) {
-        echo '<p>' . $value[1] . '</p>';
-      }
-      echo '</div>';
-    }
-    break;
-  }
-}
-?>

Deleted: app/views/user/_pageheader.tpl
===================================================================
--- app/views/user/_pageheader.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/user/_pageheader.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -1,3 +0,0 @@
-<ul id="headermenuright">
-  <li><a href="/user/login">_{Login}</a></li>
-</ul>
\ No newline at end of file

Deleted: app/views/user/_pageheader_loggedin.tpl
===================================================================
--- app/views/user/_pageheader_loggedin.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/user/_pageheader_loggedin.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -1,8 +0,0 @@
-<ul id="headermenuleft">
-  <li><a class="globallink" href="/profile/">_{Profile}</a> <a href="/profile/edit">_{edit}</a></li>
-  <li><a class="globallink" href="/friend/">_{Friends}</a></li>
-  <li><a class="globallink" href="/message/">_{Inbox} (0)</a></li>
-</ul>
-<ul id="headermenuright">
-  <li><a href="/user/logout">_{Logout}</a></li>
-</ul>
\ No newline at end of file

Deleted: app/views/user/_sidebar.tpl
===================================================================
--- app/views/user/_sidebar.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/user/_sidebar.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -1,4 +0,0 @@
-<div id="quicklogin">
-  _{Everyone Can Join}
-<a class="linkbutton" href="/user/register"><div>_{Sign Up}</div></a>
-</div>
\ No newline at end of file

Deleted: app/views/user/_sidebar_loggedin.tpl
===================================================================
--- app/views/user/_sidebar_loggedin.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/user/_sidebar_loggedin.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -1,18 +0,0 @@
-<div id="qsearch">
-  <div>
-    <h2>Search</h2>
-  </div>
-  <form action="/search">
-     <div id="qsearchwrapper">
-       <div id="qsearchfield">
-         <input id="query" name="query" type="text" class="textinput">
-       </div>
-       <div id="qsearchimage">a
-       </div>
-     </div>
-  </form>
-</div>
-<div id="applications">
-  <div>Photos</div>
-  <div>Groups</div>
-</div>
\ No newline at end of file

Modified: app/views/user/confirm.tpl
===================================================================
--- app/views/user/confirm.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/user/confirm.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -2,7 +2,7 @@
 
 <? 
 if ($controller->getErrors()) { 
-    echo $controller->renderPartial("errors"); 
+    echo $controller->renderErrors(); 
 } else { ?>
     <p>_{Thank you for registration}</p><br>
     <p><a href="/user/login">_{go to login}</a></p>

Modified: app/views/user/forgot_password.tpl
===================================================================
--- app/views/user/forgot_password.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/user/forgot_password.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -1,6 +1,6 @@
 <div class="title">_{Trouble Accessing Your Account}?</div>
 
-<?= $controller->renderPartial("errors") ?>
+<?= $controller->renderErrors() ?>
 
 <p>_{Forgot Password}? _{Enter your login email below}. 
 _{We will send you an email with a link to reset your password}.</p>

Modified: app/views/user/login.tpl
===================================================================
--- app/views/user/login.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/user/login.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -1,6 +1,6 @@
 <div class="title">_{iSocial Login}</div>
 
-<?= $controller->renderPartial("errors") ?>
+<?= $controller->renderErrors() ?>
 
 <form action="/user/login" method="post">
   <div class="loginform">

Modified: app/views/user/register.tpl
===================================================================
--- app/views/user/register.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/user/register.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -1,6 +1,6 @@
 <div class="title">_{Sign Up}</div>
 
-<?= $controller->renderPartial("errors") ?>
+<?= $controller->renderErrors() ?>
 
 <form action="/user/register" method="post">
   <div class="loginform">

Modified: app/views/user/reset_password.tpl
===================================================================
--- app/views/user/reset_password.tpl	2008-02-26 11:33:47 UTC (rev 32)
+++ app/views/user/reset_password.tpl	2008-02-29 10:19:57 UTC (rev 33)
@@ -2,7 +2,7 @@
 
 <? 
 if ($controller->getErrors()) { 
-    echo $controller->renderPartial("errors"); 
+    echo $controller->renderErrors(); 
 } else { ?>
 <div align="center">_{Please enter a new password}.</div>
 <form action="/user/reset_password" method="post">

Modified: config/DEFAULT-config.php
===================================================================
--- config/DEFAULT-config.php	2008-02-26 11:33:47 UTC (rev 32)
+++ config/DEFAULT-config.php	2008-02-29 10:19:57 UTC (rev 33)
@@ -50,6 +50,8 @@
 
 // disable automatic translations
 define('AK_AUTOMATICALLY_UPDATE_LANGUAGE_FILES', false);
+// disable security checks, at least before http://trac.akelos.org/ticket/122 gets fixed
+define('AK_TEMPLATE_SECURITY_CHECK', false);
 
 define('I_NOREPLAY_EMAIL', '');
 


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




Thread: [Isocial-svn] SF.net SVN: isocial: [33]

isocial-svn