Changeset 634

Show
Ignore:
Timestamp:
07/09/08 13:23:48 (3 months ago)
Author:
aarkerio
Message:

Added image and comments fixed

Location:
trunk/app
Files:
1 added
8 modified

Legend:

Unmodified
Added
Removed

  • trunk/app/controllers/users_controller.php

    r633 r634  
    6666 public function entry($username, $entry_id)  
    6767 { 
    68      if ($entry_id == null) 
    69      { 
     68     if ($entry_id == null): 
    7069           $this->redirect('/blog/'.$username); 
    71            exit; 
    72      } 
     70           return false; 
     71     endif; 
    7372      
    7473     $this->pageTitle = $username . '\'s Blog'; 
    … …  
    7675     $user_id = $this->User->field("id", array("username"=>$username)); 
    7776      
    78      if ($username == null || $user_id == null) 
    79      { 
     77     if ($username == null || $user_id == null): 
    8078           $this->redirect("/"); 
    81      } 
     79     endif; 
    8280      
    8381     $this->Entry     = new Entry; 
    … …  
    8785     $fields   = array("Entry.title", "Entry.body", "Entry.created", "Entry.user_id", "Entry.discution", "Entry.subject_id", "Entry.id", "User.username", "Subject.title", "Subject.id"); 
    8886      
    89     if ( $entry_id != null && is_numeric( $entry_id ) ): // show only one new 
     87    if ( $entry_id != null && is_numeric( $entry_id ) ): // show only one new 
    9088            $conditions = array("Entry.user_id"=>$user_id, "Entry.id"=>$entry_id); 
    9189     endif; 

  • trunk/app/locale/spa/LC_MESSAGES/default.po

    r633 r634  
    7676msgid  "Acquaintances" 
    7777msgstr "Ligas amigas" 
     78 
     79msgid  "View all lessons" 
     80msgstr "Ver todas las lecciones" 
     81 
     82msgid  "Useful links" 
     83msgstr "Ligas útiles" 
    7884 
    7985msgid  "Allow comments" 

  • trunk/app/views/elements/acquaintances.ctp

    r445 r634  
    11<?php 
     2echo $html->div('temas', __('Useful links', true)); 
    23 
    3 echo $html->div('temas', 'Useful links'); 
    4  
    5 foreach ($blog["Acquaintance"] as $val)  
    6 { 
    7   echo '<a class="petit" href="'.$val['url'].'">&gt;'. $val['name'] . '</a><br />'; 
    8 } 
     4foreach ($blog["Acquaintance"] as $val): 
     5  echo $html->link('>'. $val['name'], $val['url'], aa('class', 'petit')).'<br />'; 
     6endforeach; 
    97 
    108?> 

  • trunk/app/views/layouts/portal.ctp

    r611 r634  
    122122 
    123123 echo $html->link('Karamelo Demo', 'http://www.chipotle-software.com/index.php?id=9', array("id"=>"Demo")); 
     124 
     125echo $html->div(null, $html->image('static/beta.gif', array('alt'=>'Beta')), array('style'=>'position:absolute;top:10px;left:210px;width:80px')); 
    124126?> 
    125127</body> 

  • trunk/app/views/layouts/rubyx.ctp

    r629 r634  
    5454  <ul class="box">  
    5555  <?php  
    56      $url = substr($_SERVER['argv'][0], 4, 10);  
    57      echo ($url == 'users/blog') ? '<li id="active">' : '<li>'; ?>   
    58      <a href="/users/blog/<?php echo $blog['User']['username'] ?>">eduBlog<span class="tab-l"></span><span class="tab-r"></span></a></li>  
     56     
     57     echo ($this->action == 'blog' || $this->action == 'entry') ? '<li id="active">' : '<li>'; ?>   
     58     <a href="/blog/<?php echo $blog['User']['username'] ?>">eduBlog<span class="tab-l"></span><span class="tab-r"></span></a></li>  
    5959                      
    60    <?php echo ($url == 'users/port') ? '<li id="active">' : '<li>'; ?>  
     60   <?php echo ($this->action == 'portfolio') ? '<li id="active">' : '<li>'; ?>  
    6161     <a href="/users/portfolio/<?php echo $blog['User']['username'] ?>">Portfolio<span class="tab-l"></span><span class="tab-r"></span></a></li>  
    6262                      
    63    <?php echo ($url == 'users/abou') ? '<li id="active">' : '<li>'; ?> 
     63   <?php echo ($this->action == 'aboutme') ? '<li id="active">' : '<li>'; ?> 
    6464      <a href="/vclassrooms/aboutme/<?php echo $blog['User']['username'] ?>">About Me<span class="tab-l"></span><span class="tab-r"></span></a></li>  
    6565                          
    66     <?php echo ($url == 'messages/c') ? '<li id="active">' : '<li>'; ?>  
     66    <?php echo ($this->action == 'message') ? '<li id="active">' : '<li>'; ?>  
    6767    <a href="/messages/message/<?php echo $blog['User']['username'] ?>">Contact<span class="tab-l"></span><span class="tab-r"></span></a></li> 
    6868 

  • trunk/app/views/users/blog.ctp

    r633 r634  
    1818     
    1919  if ( $val['Entry']['discution'] == 1):  //is the comments in this entry actived and is an individual entry? 
    20         e($html->div('plink',$html->link(__('Add comment', true).'  ('.count($val['Comment']).')', '/users/entry/'.$val['User']["username"].'/'.$val['Entry']['id']))); 
     20    e($html->div('plink', $html->image('static/comentarios.gif', array('alt'=>__('Add comment', true))).'  '.$html->link(__('Add comment', true).'  ('.count($val['Comment']).')', '/users/entry/'.$val['User']['username'].'/'.$val['Entry']['id']))); 
    2121  endif; 
    2222endforeach; 

  • trunk/app/views/users/entry.ctp

    r633 r634  
    1919        echo  $html->div(null, $html->image('static/comment.gif', array('alt'=>'Comments')) . '  Comments:', array('id'=>'comments'));   
    2020   else: 
    21                 echo '<div id="comments">'  . $html->image('static/comment.gif', array("alt"=>"Comments")) . ' Comments:<a style="font-size:7pt" href="#new_comment">&gt;&gt;</a></div>'; 
     21        echo '<div id="comments">'.$html->image('static/comment.gif',array("alt"=>"Comments")) .' Comments:<a style="font-size:7pt" href="#new_comment">&gt;&gt;</a></div>'; 
    2222   endif; 
    2323         

  • trunk/app/views/users/portfolio.ctp

    r431 r634  
    5050<div class="portfolio" id="exams"  onmouseover="changecolor(this.id, 'yellow');" onMouseOut="changecolor(this.id, '#ffcc00');"> 
    5151     <?php echo $html->link($html->image('admin/tests.png', array("title"=>"Exams", "alt"=>"Exams")), '/tests/display/'.$blog["User"]["username"] .'/'. $blog["User"]["id"], null, null, false); ?><br /> 
    52      Exams 
     52     Tests 
    5353</div> 
    5454<div class="portfolio" id="links"  onmouseover="changecolor(this.id, 'yellow');" onMouseOut="changecolor(this.id, '#ffcc00');">