Changeset 665

Timestamp:

07/22/08 12:58:53 (3 months ago)

Author:

aarkerio

Message:

Update general

Location:

trunk/app

Files:

• config/sql/postgresql/entries.sql (modified) (1 diff)
• config/sql/postgresql/news.sql (modified) (2 diffs)
• controllers/news_controller.php (modified) (2 diffs)
• views/vclassrooms/admin_members.ctp (modified) (1 diff)
• webroot/img/static/feedback_icon.png (added)

trunk/app/config/sql/postgresql/entries.sql

@@ -4 +4 @@
 title varchar(50) NOT NULL,
 body text NOT NULL,
-subject_id int REFERENCES subjects (id) ON DELETE CASCADE,
+subject_id int REFERENCES subjects(id) NOT NULL,
 created timestamp(0) with time zone DEFAULT now() NOT NULL,
 status int NOT NULL DEFAULT 0,

trunk/app/config/sql/postgresql/news.sql

@@ -6 +6 @@
   created timestamp(0) with time zone DEFAULT now() NOT NULL,
   reference varchar(350),
-  theme_id int NOT NULL REFERENCES themes(id) ON DELETE CASCADE,
+  theme_id int NOT NULL REFERENCES themes(id),
   status smallint NOT NULL,   -- 0 = draft, 1 = published
   user_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
@@ -14 +14 @@
 
 INSERT INTO news ("title", "body", "reference", "theme_id", "status", "user_id") VALUES ('Welcome to Karamelo!', 
-'<p>The Maya site may have bee.</p><p>The city was first mentioned by Juan DiezThe site is of moderate size, with construction of modest sized buildings.</p>', 
+'<p>Karamelo is a cool eLearning platform.</p><p>Please follow the <a href="http://www.chipotle-software.com/">Admin</a> manual to publish news and events.</p>', 
 'http://www.chipotle-software.com/',
 3, 1, 1);

trunk/app/controllers/news_controller.php

@@ -32 +32 @@
    $this->layout = 'portal';
         
-   $this->pageTitle = 'News';
+   $this->pageTitle = __('News', true);
     
    $data = $this->paginate('News', array('News.status = 1'));
@@ -49 +49 @@
   $this->layout = 'portal';
 
-  $this->pageTitle = '::'.__('News', true);
+  $this->pageTitle = __('News', true);
 
   $this->News->User->unbindAll();

trunk/app/views/vclassrooms/admin_members.ctp

@@ -15 +15 @@
 $r="javascript:window.open('/admin/vclassrooms/forum/".$data['Vclassroom']['id']."', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=400')"; 
 
-echo $html->link(
-         $html->image('static/icon_test.jpg', array("alt"=>"Add test", "title"=>"Add test", "style"=>"margin-right:12px")
+/* echo $html->link(
+         $html->image('static/icon_test.jpg', array('alt'=>'Link test', 'title'=>'Link test', "style"=>"margin-right:12px")
          ), '#', array("onclick"=>$t), null, null, false);
 
  echo $html->link(
-         $html->image('static/icon_webquest.jpg', array("alt"=>"Add webquest", "title"=>"Add webquest", "style"=>"margin-right:12px")
+         $html->image('static/icon_webquest.jpg', array("alt"=>"Link webquest", "title"=>"Link webquest", "style"=>"margin-right:12px")
      ), '#', array("onclick"=>$w), null, null, false);
 
  echo $html->link(
-        $html->image('static/icon_treasure.jpg', array("alt"=>"Add treasure", "title"=>"Add hunt", "style"=>"margin-right:12px")
+        $html->image('static/icon_treasure.jpg', array("alt"=>"Link Treasure", "title"=>"Link Treasure", "style"=>"margin-right:12px")
         ), '#', array("onclick"=>$r), null, null, false);
-
 
  echo $html->link(
         $html->image('admin/forums_icon.png', array("alt"=>"Add forum", "title"=>"Add forum", "style"=>"margin-right:12px")
-        ), '#', array("onclick"=>$r), null, null, false);
+        ), '#', array("onclick"=>$r), null, null, false); 
 
  echo $html->link(
-        $html->image('static/gnome-pdf.gif', array("alt"=>"Export report", "title"=>"Export report", "style"=>"margin-right:12px")
+        $html->image('static/feedback_icon.png', array('alt'=>__('Ask for feedback', true), 'title'=>__('Ask for feedback', true), "style"=>"margin-right:12px")
+        ), '/admin/vclassrooms/export/'.$data['Vclassroom']['id'], null, null, false); */
+
+ echo $html->link(
+        $html->image('static/gnome-pdf.gif', array('alt'=>'Export report', 'title'=>'Export report', 'style'=>'margin-right:12px')
         ), '/admin/vclassrooms/export/'.$data['Vclassroom']['id'], null, null, false);