Changeset 459

Timestamp:

05/07/08 18:55:47 (8 months ago)

Author:

aarkerio

Message:

I improved layouts and users display

Location:

trunk/app

Files:

• controllers/confirms_controller.php (modified) (1 diff)
• controllers/users_controller.php (modified) (1 diff)
• controllers/vclassrooms_controller.php (modified) (2 diffs)
• views/layouts/admin.ctp (modified) (1 diff)
• views/layouts/rubyx.ctp (modified) (2 diffs)
• views/users/about.ctp (modified) (1 diff)
• views/vclassrooms/aboutme.ctp (added)
• webroot/css/cpanel/cpanel.css (modified) (5 diffs)
• webroot/img/admin/top.png (modified) (previous)

trunk/app/controllers/confirms_controller.php

@@ -54 +54 @@
      if ($this->User->save($this->data) && $this->Confirm->delete($data['Confirm']['id']))
      {
-                 $this->flash('Your account has been activated', '/users/login', 2);
+                 $this->flash('Your account has been activated', '/users/login', 1);
      }
      else

trunk/app/controllers/users_controller.php

@@ -125 +125 @@
         $this->pageTitle = 'About ' . $username;
         
-        $user_id = $this->User->field("id", array("username"=>$username));
-        
-        $this->layout    = $this->Edublog->layout($user_id);
-        
-        $this->Edublog->blog($user_id); // blogger elements
-        
-        $conditions      = array("User.id"=>$user_id);
-        
-        $this->set('data', $this->User->findAll($conditions));        
- }
-
-  public function alumni()
-  {
+        $this->layout    = 'portal';
+
+        $this->Portal->statics(); // Using Portal component
+   
+        $conditions      = array("User.username"=>trim($username));
+
+        $this->set('data', $this->User->find($conditions));        
+ }
+
+ public function alumni()
+ {
         $this->layout    = 'portal';
         

trunk/app/controllers/vclassrooms_controller.php

@@ -20 +20 @@
  public function beforeFilter()
  {
-      $this->Auth->allow(array('show', 'jointoclass', 'display', 'participation'));
+      $this->Auth->allow(array('show', 'jointoclass', 'aboutme', 'display', 'participation'));
       parent::beforeFilter();
  }
@@ -55 +55 @@
       }
  }
-                                                    
+
+ public function aboutme($username) 
+ {
+      $conditions = array('User.username'=>trim($username));
+      
+      $this->Vclassroom->User->unbindModel(array('hasMany'=>array('Vclassroom', 'Lesson', 'Faq', 'Acquaintance', 'Entry', 'Category'), 'belongsTo'=>array('Group')));
+
+      $data = $this->Vclassroom->User->find($conditions);
+      
+      $this->pageTitle = 'About me  '. $data['User']['name'];
+      $this->layout    = $this->Edublog->layout($data['User']['id']);
+      $this->Edublog->blog($data['User']['id']);
+      
+      $this->set('data', $data);
+ }
+
  public function show($user_id, $id) 
  {

trunk/app/views/layouts/admin.ctp

@@ -29 +29 @@
 
 <div id="header">
-
-<h1><?php echo $html->link('Karamelo: Control Panel', '/admin/entries/start'); ?></h1>
+<h1><?php echo $html->link('Karamelo: Control Panel', '/admin/entries/start'); ?></h1> e-Learning platform
 <?php 
-  echo $html->para(null, 'e-Learning platform'); 
   echo $html->link($cU['User']['username'] . '\'s blog',  '/blog/'. $cU['User']['username'],  array("style"=>"color:white;text-decoration:none;font-weight:bold;")); 
 ?>
+Logged in as <strong><?php echo $cU['User']['username']; ?></strong> |
+    <?php echo $html->link($_SERVER['SERVER_NAME'], '/').' '. $html->link('My Account', '/admin/users/edit') .' | '. $html->link('Logout', '/users/logout'); ?>
 </div><!-- header ends-->
-  <p>
-     Logged in as <strong><?php echo $cU['User']['username']; ?></strong> |
-     <strong><a href="/"><?php  echo $_SERVER['SERVER_NAME']; ?></a></strong>    
-       <?php echo $html->link('My Account', '/admin/users/edit'); ?> |
-       <?php echo $html->link('Logout', '/users/logout'); ?>
- </p>
 <div style="clear:both;"></div>
 <?php echo $this->renderElement('admin_menu'); ?>
 
-<div style="float:left;border:1px solid white;width:600px;margin:10px 300px;text-align:left;">
+<div style="float:left;border:1px solid white;width:900px;margin:15px 10px 10px 100px;text-align:left;">
                       <?php echo $content_for_layout ?>
 </div>
 <div style="clear:both;"></div>
 
-   <div id="footer">
-          <p>Powered by the <a href="http://www.chipotle-software.com/" rel="external">Karamelo Project &copy; 2002-2008 GPLv3</a> </p>
-   </div>
+<?php echo $html->div('footer', 'Powered by the '. $html->link('Karamelo Project &copy; 2002-2008 GPLv3', 'http://www.chipotle-software.com/', null, false, false)); ?>
 
 <div style="position:absolute;top:15px;left:800px"><!-- help button-->

trunk/app/views/layouts/rubyx.ctp

@@ -53 +53 @@
               echo $form->create("Entry", array("action"=>"search", "onsubmit"=>"return chkSearch()"));
               echo $form->hidden('Entry.user_id', array("value"=>$blog['User']['id']));
-                echo '<fieldset><legend>Search</legend>'; 
+              echo '<fieldset><legend>Search</legend>'; 
               echo $form->label('Entry.terms', 'Find:', array("class"=>"noscreen"));
-               echo '<span id="search-input-out">';
+          echo '<span id="search-input-out">';
               echo $form->input('Entry.terms', array("size"=>"30", "id"=>"search-input-out")); 
               echo '</span>';
@@ -80 +80 @@
                      
                     <?php echo ($url == 'users/abou') ? '<li id="active">' : '<li>'; ?>
-                    <a href="/users/about/<?php echo $blog['User']['username'] ?>">About Me<span class="tab-l"></span><span class="tab-r"></span></a></li> 
+                    <a href="/vclassrooms/aboutme/<?php echo $blog['User']['username'] ?>">About Me<span class="tab-l"></span><span class="tab-r"></span></a></li> 
                          
                     <?php echo ($url == 'messages/c') ? '<li id="active">' : '<li>'; ?> 

trunk/app/views/users/about.ctp

@@ -4 +4 @@
 <?php
 //die( var_dump($blog) );
-    echo  "<div class=\"title_section\">Classrooms</div>";
-    echo  $data[0]['User']['name']    . " <br />";
-    echo  $data[0]['User']['cv']    . " <br />";
-    echo  $html->image('avatars/'.$data[0]['User']['avatar'], array("alt" => $data[0]['User']['name'], "title" =>$data[0]['User']['name'])) . " ";
-    
+    echo  $data['User']['name']    . " <br />";
+    echo  $data['User']['cv']      . " <br />";
+    echo  $html->image('avatars/'.$data['User']['avatar'], array("alt" => $data['User']['name'], "title" =>$data['User']['name'])) . " ";
 ?> 
 </div>

trunk/app/webroot/css/cpanel/cpanel.css

@@ -15 +15 @@
     display: block;
     margin: 0 auto;
-    padding: 0 0 0 100px;
+    padding: 6px;
     text-align: left;
     font-size: smaller;
@@ -40 +40 @@
 #header h1 {
     margin: 0;
-    padding-top: 20px;
+    padding-top: 7px;
     color: #fff;
     font-weight: bold;
@@ -49 +49 @@
     color: #fff;
     text-decoration: none;
-     font-size: smaller;
+    font-size: smaller;
 }
 .title_section{ 
@@ -77 +77 @@
 
 /* Footer */
-#footer {
+.footer {
     letter-spacing: 1px;
     border-top: 1px dotted #babdb6;
@@ -83 +83 @@
     color: #888a85;
     padding: 10px;
-}
-
-#footer a, #footer a:hover {
+    font-size:7pt;
+}
+
+.footer a, #footer a:hover {
     text-decoration: none;
-}
-
-#footer p {
-    font-size: smaller;
-    margin: 0 0 10px 0;
-}
+    font-size:7pt;
+}
+
 /* End Footer */