Changeset 610

Timestamp:

06/16/08 23:05:09 (5 months ago)

Author:

aarkerio

Message:

RSS

Location:

trunk/app

Files:

• controllers/components/edublog.php (modified) (5 diffs)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• views/images/admin_listing.ctp (modified) (1 diff)
• views/layouts/admin.ctp (modified) (2 diffs)
• views/layouts/rss.ctp (modified) (1 diff)
• views/layouts/rubyx.ctp (modified) (2 diffs)
• views/news/rss.ctp (modified) (2 diffs)
• views/quotes/admin_listing.ctp (modified) (1 diff)
• views/users/entry.ctp (modified) (1 diff)
• webroot/css/rubyx/rubyx.css (modified) (1 diff)

trunk/app/controllers/components/edublog.php

@@ -32 +32 @@
   
  // Unbind on fly
- $this->User->unbindModel(array(
-                          'hasMany'   => array('Vinculum', 'Category', 'Entry', 'Faq', 'Vclassroom', 'Podcast', 'Lesson'),
+ /* $this->User->unbindModel(array(
+                          'hasMany'   => array('Vinculum', 'Category', 'Entry', 'Faq', 'Vclassroom', 'Podcast', 'Lesson', 'Confirm'),
                           'belongsTo' => array('Group')
                            )
-                          );
-  
+                          ) */;
+ $this->User->unbindAll();
  // Temporal bind
  $this->User->bindModel(
@@ -46 +46 @@
                                 'order'         => 'Podcast.created DESC',
                                 'limit'         => '10',
+                                'fields'        => 'id, title, length',
                                 'foreignKey'    => 'user_id',
                                 'dependent'     => true,
@@ -56 +57 @@
                                  'order'         => 'Lesson.created DESC',
                                  'limit'         => '10',
+                                 'fields'         => 'id, title',
                                  'foreignKey'    => 'user_id',
                                  'dependent'     => true,
@@ -81 +83 @@
                                  'finderQuery'   => ''
                                  ),
-                        'Catforum' =>
-                           array('className'     => 'Catforum',
-                                 'conditions'    => array('Catforum.status' => 1, 'Catforum.user_id' => $user_id),
-                                 'order'         => 'Catforum.created DESC',
-                                 'limit'         => '10',
-                                 'foreignKey'    => 'user_id',
-                                 'dependent'     => true,
-                                 'exclusive'     => false,
-                                 'finderQuery'   => ''
-                                 ),
                          'Vclassroom' =>
                            array('className'     => 'Vclassroom',
                                  'conditions'    => array('Vclassroom.status' => 1, 'Vclassroom.user_id' => $user_id),
-                                 'order'         => 'Vclassroom.created DESC',
-                                 'limit'         => '10',
+                                 'order'         => 'Vclassroom.name DESC',
+                                 'limit'         => '12',
                                  'foreignKey'    => 'user_id',
                                  'dependent'     => true,
@@ -101 +93 @@
                                  'finderQuery'   => ''
 
-                           )
+                                 ),
+                         'Quote' =>
+                           array('className'     => 'Quote',
+                                 'conditions'    => array('Quote.user_id' => $user_id),
+                                 'order'         => 'random()',
+                                 'limit'         => '1',
+                                 'fields'        => 'quote, author',   
+                                 'foreignKey'    => 'user_id',
+                                 'dependent'     => true,
+                                 'exclusive'     => false,
+                                 'finderQuery'   => ''
+
+                                 )
                         )
                     )
                  );
-  
+  $this->User->Acquaintance->unbindAll();
+  $this->User->Podcast->unbindAll();
+  $this->User->Lesson->unbindAll();
+  $this->User->Vclassroom->unbindAll();
+
   $conditions = array("User.id"=>$user_id, "User.active"=>1);
   $fields     = array("User.id", "User.created", "User.name_blog", "User.quote", "User.cv", "User.avatar", "User.username");

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

@@ -143 +143 @@
 msgstr "Imágenes"
 
+msgid  "Upload Image"
+msgstr "Subir Imagen"
+
 msgid  "Teacher tools"
 msgstr "Herramientas pedagógicas"

trunk/app/views/images/admin_listing.ctp

@@ -1 +1 @@
 <?php 
 //popup or full window ?
-if ( $set == null )
- { 
-   echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
-   echo $html->addCrumb('Images', '#'); 
-   echo $html->getCrumbs(' / ');
-   echo $html->div('title_section', 'Images');
-   $return = null;
- } 
- else
- {
-   $return = 'set';
- }
+if ( $set == null ):
+    echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
+    echo $html->addCrumb(__('Images', true), '#'); 
+    echo $html->getCrumbs(' / ');
+    echo $html->div('title_section', __('Images', true));
+    $return = null;
+else:
+    $return = 'set';
+ endif;
 ?>
 

trunk/app/views/layouts/admin.ctp

@@ -5 +5 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  <head>
-  <title>Karamelo: Control Panel</title>
+  <title>Karamelo</title>
 <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 <!--[if gte IE 5.5]>
@@ -30 +30 @@
 <div id="header">
 <div style="width:300px;float:left;margin-right:15px;">
-<h1><?php echo $html->link('Karamelo: Control Panel', '/admin/entries/start'); ?></h1> 
-<?php echo $html->para(null, 'e-Learning platform'); ?>
+<h1><?php echo $html->link('Karamelo', '/admin/entries/start'); ?></h1> 
+<?php echo $html->para(null, 'Web 2.0 eLearning platform'); ?>
 </div>
 <div style="width:700px;float:left;"> 
-Logged in as <strong><?php echo $session->read('Auth.User.username'); ?></strong> |
+<?php __('Logged in'); ?> <strong><?php echo $session->read('Auth.User.username'); ?></strong> |
 <?php  
   echo $html->link($session->read('Auth.User.username') . '\'s blog',  '/blog/'. $session->read('Auth.User.username')) . ' | '; 
   echo $html->link($_SERVER['HTTP_HOST'], '/').' | ';
-  echo $html->link('My Account', '/admin/users/edit') .' | '. $html->link('Logout', '/users/logout'); ?>
+  echo $html->link(__('My profile', true), '/admin/users/edit') .' | '. $html->link(__('Logout', true), '/users/logout'); 
+?>
 </div>
 </div><!-- header ends-->

trunk/app/views/layouts/rss.ctp

@@ -1 +1 @@
 <?php echo '<?xml version="1.0" encoding="UTF-8" ?>'."\n"; ?>
-<rss version="2.0">
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <?php echo $content_for_layout; ?>
 </rss>

trunk/app/views/layouts/rubyx.ctp

@@ -75 +75 @@
          
 <div id="strip" class="box noprint"> 
+<?php 
+ if ( isset($blog['Quote'][0]['quote']) ):
+    e($html->div(null, '<i>'.$blog['Quote'][0]['quote'] . '</i><br /><b>'. $blog['Quote'][0]['author'].'</b>',aa('id', 'breadcrumbs')));
+ endif;
+?> 
      
 <!-- RSS feeds --> 
-<p id="rss"><strong>RSS:</strong> 
+<div id="rss"><strong>RSS:</strong> 
 <?php
  e($html->link('Blog', '/entries/rss/'.$blog['User']['username']) . '/'); 
  e($html->link('Podcast', '/podcasts/rss/'.$blog['User']['username']));
 ?>
-</p> 
-
-<hr class="noscreen" />
+</div> 
 </div> <!-- /strip -->
  <!-- Content --> 
-        <?php echo $html->div(null, $content_for_layout, aa('id', 'content')); ?> 
+  <?php    echo $html->div(null, $content_for_layout, aa('id', 'content'));?> 
 <!-- /content --> 
 <!-- Right column --> 
@@ -93 +96 @@
 <div id="col-in"> 
 <?php 
- if ( $blog["Vclassroom"] != null) 
- { 
+ if ( $blog["Vclassroom"] != null): 
      echo $this->element('vclassrooms', $blog["Vclassroom"]);  
- }
+ endif;
 
  echo $html->div('temas', $blog['User']['username'] . ' profile'); 

trunk/app/views/news/rss.ctp

@@ -1 @@
-<rss version="2.0">
 <channel>
-<title>::MonoNeurona RSS::</title>
+<title>::Karamelo RSS::</title>
    <link>http://<?php echo $_SERVER['SERVER_NAME'] ?></link>
-   <description>Noticias del mundo libre</description>
-   <language>es-MX</language>
+   <description>College</description>
+   <language>en-US</language>
    <image> 
-      <title>MonoNeurona - Minuto x Minuto</title>
+      <title>Karamelo - Minuto x Minuto</title>
       <url>http://www.mononeurona.org/img/static/mn-small.png</url>
-      <link>http://www.monneurona.org</link>
+      <link>http://<?php echo $_SERVER['SERVER_NAME'] ?></link>
           <width>100</width>
           <height>71</height>
    </image>
 <?php 
-//exit(print_r($data));
-foreach ($data as $v) {  // entries 
-    
+//exit(debug($data));
+foreach ($data as $v):    
     $body   = substr($v["News"]['body'],0,300) . "...";
 ?>
@@ -23 +21 @@
         <comments><?php echo $_SERVER['SERVER_NAME'] ?>/news/display/<?php echo $v["News"]["id"] ?></comments>
         <description><![CDATA[<?php echo $body; ?>]]></description>
-             <pubdate><?php  echo $v["News"]["created"] ?></pubdate>
-         <creator><?php  echo $v["News"]["created"] ?></creator>
+             <dc:date><?php  echo $v["News"]["created"] ?></dc:date>
              <category><?php echo $v["News"]['theme_id']; ?></category>
         <guid><?php echo $_SERVER['SERVER_NAME'] ?>/news/display/<?php echo $v["News"]["id"] ?></guid>
     </item>
-<?php } ?> 
+<?php 
+endforeach; 
+?> 
 
 </channel>
-</rss>

trunk/app/views/quotes/admin_listing.ctp

@@ -1 +1 @@
 <?php 
-  echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
+  echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
   echo $html->getCrumbs(' / '); 
-  echo $html->div('title_section', 'Quick News');
 
-echo $html->para(null, $html->link($html->image('actions/new.png', array("alt"=>"Add new", "title"=>"Add new")), '#', array("onclick"=>"hU()"), false, false)); ?>
+  echo $html->div('title_section', __('Quotes', true));
+
+echo $html->para(null, $html->link($html->image('actions/new.png', array('alt'=>'Add new quote','title'=>'Add new quote')), '#', array("onclick"=>"hU()"), false, false)); ?>
 
 <div id="trh" style="margin:0;padding:0;padding-left:40px;width:80%;display:none;">
 <?php echo $form->create('Quote', array('action'=>'add', 'onsubmit'=>'return chkData()')); ?>
  <fieldset>
- <legend>New quote</legend
+ <legend><?php __('New quote'); ?></legend>
    <?php 
    echo $form->input('Quote.quote', array("size" => 60, "maxlength"=>130));

trunk/app/views/users/entry.ctp

@@ -1 +1 @@
 <?php
-//exit(print_r($data));
+//exit(debug($blog));
     
     $discution =  $data['Entry']['discution'];

trunk/app/webroot/css/rubyx/rubyx.css

@@ -141 +141 @@
 
     /* Strip - breadcrumbs */
-    #strip #breadcrumbs {width:520px; margin:0; padding:0;}
+    #strip #breadcrumbs {width:420px; margin:0; padding:0;font-size:8pt;font-family:Georgia;float:left;color:black;}
     
     /* Strip - RSS */