Changeset 807

Timestamp:

10/10/08 21:17:54 (8 weeks ago)

Author:

aarkerio

Message:

Little changes

Location:

trunk/app

Files:

• controllers/components/search.php (modified) (2 diffs)
• controllers/entries_controller.php (modified) (2 diffs)
• views/layouts/portal.ctp (modified) (5 diffs)

trunk/app/controllers/components/search.php

@@ -70 +70 @@
       $q .= "to_tsquery('karamelo_".$this->lang."','".$t."')) AS rank FROM news, to_tsquery('karamelo_".$this->lang."','".$t."') ";
       $q .= "query WHERE to_tsquery('karamelo_".$this->lang."','".$t."') @@ to_tsvector('karamelo_".$this->lang."', body) ";
-      $q .= "ORDER BY rank DESC LIMIT 20) AS foo";    
+      $q .= "ORDER BY rank DESC LIMIT 20) AS news";    
      break;
    case 'Entry':
@@ -77 +77 @@
       $q .= "to_tsquery('karamelo_".$this->lang."','".$t."')) AS rank FROM entries, to_tsquery('karamelo_".$this->lang."','".$t."') ";
       $q .= "query WHERE to_tsquery('karamelo_".$this->lang."','".$t."') @@ to_tsvector('karamelo_".$this->lang."', body) ";
-      $q .= "ORDER BY rank DESC LIMIT 20) AS foo";
+      $q .= "ORDER BY rank DESC LIMIT 20 ) AS entries";
      break;              
   

trunk/app/controllers/entries_controller.php

@@ -76 +76 @@
  }
  
-
  public function rss($username)
  {
@@ -111 +110 @@
       
   $this->Sanitize->paranoid($this->data['Entry']['terms']);
-  
+ 
   $this->set('data', $this->Search->getRows($this->data['Entry']['terms']));
  }

trunk/app/views/layouts/portal.ctp

@@ -29 +29 @@
 <div id="toplinks">
 <?php
+ echo $html->link(__('Home', true), '/') . ' | ';
+
  if ( $session->check('Auth.User') ):
-   echo '<span style="font-size:7pt;color:#8bb126;padding-right:15px">'.__('logged_in', true).' <b>';
-
-   echo $session->read('Auth.User.username') .'</b></span>'.$html->link(__('Logout', true), '/users/logout') . ' | '; 
+   echo '<span style="font-size:7pt;color:#8bb126;padding-right:3px">'.__('logged_in', true).' <b> ';
+   echo $session->read('Auth.User.username') .'</b></span>| '.$html->link(__('Logout', true), '/users/logout') . ' | '; 
 
    if ( $session->read('Auth.User.group_id') < 3 ): // the logged user is teacher or admin?
@@ -40 +41 @@
    if (  $session->read('Auth.User.group_id') == 3 ): // the logged user is student
      echo $html->link(__('My profile', true), '/users/edit'). ' | ';
-
    endif;
 
@@ -52 +52 @@
      echo $html->link(__('Login', true), '#', array("id"=>"logindiv", "onclick"=>"javascript:mod('logindiv', 1, '')")) .  ' | ';
  endif;
- 
- echo $html->link(__('Home', true), '/') . ' | ';
+  
  echo $html->link(__('about_college', true), '/colleges/view') . ' | ';
  echo $html->link(__('Contact', true), '/messages/contact') . ' | ';
@@ -72 +71 @@
    echo $this->element('menu_b');
    
+   // search box
+   $list = array('<h2 class="bg3">'.__('Search', true).'</h2>'.$this->element('search'));
+   echo $html->nestedList($list);
+
    // if student logged in, show groups
    if ( $session->check('Auth.User') && $session->read('Auth.User.group_id') == 3 && $Element['Vclassrooms'] != false):
@@ -94 +97 @@
         
    echo $this->element('subjects'); 
-
-   // search
-   $list = array('<h2 class="bg3">'.__('Search', true).'</h2>'.$this->element('search'));
-   echo $html->nestedList($list);
 
   $tmp  = $html->para(null,$html->link($html->image('static/valid_xhtml10_80x15_22.png'), 'http://www.w3.org/TR/xhtml1/', null, null, false));