Changeset 313

Timestamp:

03/06/08 12:30:15 (10 months ago)

Author:

aarkerio

Message:

rename views

Location:

trunk/app

Files:

• controllers/catglossaries_controller.php (modified) (3 diffs)
• controllers/podcasts_controller.php (modified) (5 diffs)
• views/acquaintances/admin_edit.ctp (modified) (1 diff)
• views/acquaintances/admin_listing.ctp (modified) (2 diffs)
• views/catglossaries/admin_add.ctp (modified) (1 diff)
• views/catglossaries/admin_listing.ctp (modified) (1 diff)
• views/covers (deleted)
• views/elements/acquaintances.ctp (moved) (moved from trunk/app/views/elements/acquaintances.thtml)
• views/elements/catfaqs.ctp (moved) (moved from trunk/app/views/elements/catfaqs.thtml)
• views/elements/catforums.ctp (moved) (moved from trunk/app/views/elements/catforums.thtml)
• views/elements/faqs.ctp (moved) (moved from trunk/app/views/elements/faqs.thtml)
• views/elements/podcast.ctp (moved) (moved from trunk/app/views/elements/podcast.thtml)
• views/elements/subjects.ctp (moved) (moved from trunk/app/views/elements/subjects.thtml)
• views/errors/error404.ctp (moved) (moved from trunk/app/views/errors/error404.thtml)
• views/glossaries/admin_listing.ctp (modified) (1 diff)
• views/layouts/rss.ctp (moved) (moved from trunk/app/views/layouts/rss.thtml)
• views/news/all.ctp (moved) (moved from trunk/app/views/news/all.thtml)
• views/news/single.ctp (moved) (moved from trunk/app/views/news/single.thtml)
• views/podcasts/admin_listing.ctp (modified) (1 diff)
• views/subjects/admin_add.ctp (moved) (moved from trunk/app/views/subjects/admin_add.thtml)
• views/subjects/admin_listing.ctp (moved) (moved from trunk/app/views/subjects/admin_listing.thtml)
• views/subjects/qs.ctp (moved) (moved from trunk/app/views/subjects/qs.thtml)
• views/subjects/show.ctp (moved) (moved from trunk/app/views/subjects/show.thtml)
• views/subjects/view.ctp (moved) (moved from trunk/app/views/subjects/view.thtml)

trunk/app/controllers/catglossaries_controller.php

@@ -13 +13 @@
  
  public $components       = array('Edublog');
+
+ public function isAuthorized()
+ {
+        if (isset($this->params[Configure::read('Routing.admin')]))
+        {
+                 if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2)
+                 {
+                        return true;
+                 }
+    }
+        return false;
+ }
  
- public function isAuthorized() 
- {
-    if ($this->action == 'delete') 
-    {
-      if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ) 
-          {
-         return true;
-          }
-     }
- 
-    return false;
-  }
-
  public function display($username)
  {
@@ -83 +82 @@
  }
  
+ public function admin_items($id)
+ {
+        $this->layout    = 'admin';
+        
+        $this->pageTitle = 'Glossaries';
+        
+        $conditions = array("Catglossary.user_id" => $this->Auth->user('id'), "Catglossary.id" => $id);
+     
+        $this->set('data', $this->Catglossary->find($conditions));
+ }
+
  public function admin_add()
  {
@@ -92 +102 @@
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->cleanArray($this->data["Catglossary"]); //Hopefully this is enough
+        $this->Sanitize->clean($this->data["Catglossary"]);
         
         $this->data["Catglossary"]["user_id"] = $this->Auth->user('id');

trunk/app/controllers/podcasts_controller.php

@@ -5 +5 @@
 *  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
-Vendor('CMP3File');
+
+App::import('Vendor', 'CMP3File');
 uses('sanitize');
 
@@ -16 +17 @@
    public function isAuthorized()
    {
-              if (isset($this->params[Configure::read('Routing.admin')]))
-                     {
-                              if ($this->Auth->user('group_id') != 1)
-                                       {
-                                                    return false;
-                                                          }
-                                                             }
-                                                                return true;
+           if (isset($this->params[Configure::read('Routing.admin')]))
+           {
+                 if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2)
+                 {
+                        return true;
+                 }
+       }
+        return false;
   }
                                                             
@@ -143 +144 @@
  public function admin_listing()
  {   
-      $this->pageTitle = $this->othAuth->user('username') . '\'s Podcasts';
+      $this->pageTitle = $this->Auth->user('username') . '\'s Podcasts';
        
       $this->layout = 'admin';
         
-      $conditions   = array("Podcast.user_id"=>$this->othAuth->user('id'));
+      $conditions   = array("Podcast.user_id"=>$this->Auth->user('id'));
       $fields       = array("id", "title", "description", "created", "length", "status", "filename");
       $order        = "Podcast.id DESC";
@@ -216 +217 @@
     $field       = "id";
     
-    $conditions  = array("user_id" =>  $this->othAuth->user('id'));
+    $conditions  = array("user_id" =>  $this->Auth->user('id'));
     
     $order       = "Podcast.id DESC";
@@ -231 +232 @@
     }
     
-    $Name        = $this->othAuth->user('username') . "_" . $next_id . '.'. $extension;
+    $Name        = $this->Auth->user('username') . "_" . $next_id . '.'. $extension;
      
     /** setup final file location and name */

trunk/app/views/acquaintances/admin_edit.ctp

@@ -4 +4 @@
   echo $html->getCrumbs(' / '); 
 
-  echo $form->create('Acquaintance', array('action'=>'admin_edit'));
+  echo $form->create('Acquaintance', array('onsubmit'=>'check()'));
   echo $form->hidden('Acquaintance.id'); 
+
 ?>
 

trunk/app/views/acquaintances/admin_listing.ctp

@@ -29 +29 @@
  <legend>New Acquaintance</legend>
    <?php 
-    echo $form->label('Acquaintance.name', 'Site:') . '<br />';
     echo $form->input('Acquaintance.name', array("size" => 30, "maxlength"=>50)); 
     echo $form->error('Acquaintance.name', 'A name is required.'); 
@@ -41 +40 @@
 </p>  
 <?php 
-    echo $form->label('Acquaintance.url', 'URL:') . '<br />';
     echo $form->input('Acquaintance.url', array("size" => 60, "maxlength"=>300, "value"=>"http://"));
     echo $form->error('Acquaintance.url', 'An author is required.'); 

trunk/app/views/catglossaries/admin_add.ctp

@@ -1 @@
-<div>
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
-</div>
-<div class="title_section">Add new Glossary Category</div>
+<?php
+  echo $html->div(null, $html->addCrumb('Control Tools', '/admin/entries/start'). $html->getCrumbs(' / ')); 
+  echo $html->div('title_section', 'Add new Glossary Category');
+?>
 
 <div class="spaced">
 
-<?php echo $html->formTag('/admin/catglossaries/add','post'); ?>
+<?php echo $form->create('Catglossary', array('action'=>'admin_add')); ?>
 <fieldset>
   <legend>New Category</legend>
   <?php 
-    echo $form->labelTag( 'Catglossary/title', 'Title:' );
-    echo $html->input('Catglossary/title', array("size" => 30, "maxlength" => 90, "value"=>"Example: American history"));
-    echo $html->tagErrorMsg('Catglossary/title', 'A FAQ title is required.');
+    echo $form->input('Catglossary.title', array("size" => 30, "maxlength" => 90, "value"=>"Example: Brazilian history"));
+    echo $form->error('Catglossary.title', 'A Glossary title is required.');
      
-     echo $form->labelTag('Catglossary/description', 'Description:' );
-    echo $html->textarea('Catglossary/description', array("cols" => 40, "row" => 20));
-    echo $html->tagErrorMsg('Catglossary/description', 'A category description is required.');
+    echo $form->label('Catglossary.description', 'Description:' );
+    echo $form->textarea('Catglossary.description', array("cols" => 40, "row" => 20));
+    echo $form->error('Catglossary.description', 'A category description is required.');
   ?>
   <br /><br />
   <div style="clear:both"></div>
-  <?php echo $form->labelTag( 'Catglossary/status', 'Activate Category Glossary:' );?><br />
-  <?php echo $html->checkbox('Catglossary/status'); ?><br />
+  <?php echo $form->label('Catglossary.status', 'Activate Category Glossary:' );?><br />
+  <?php echo $form->checkbox('Catglossary.status'); ?><br />
   <br /><br />
   <div style="clear:both"></div>
-  <br />
-  <?php echo $html->submit('Save') ?>
-</fieldset>
-</form>
+  <br /></fieldset>
+  <?php echo $form->end('Save'); ?>
 </div>

trunk/app/views/catglossaries/admin_listing.ctp

@@ -10 +10 @@
 <?php
 //exit(print_r($data));
-foreach ($data as $val)
-    {
-         echo '<div style="padding:6px;margin:5px;border:1px dotted gray;">';
-         echo $gags->sendEdit($val['Catglossary']['id'], 'catglossaries') . '<br />';
+foreach ($data as $val) 
+{
+   echo '<div style="padding:6px;margin:5px;border:1px dotted gray;">';
+   echo $gags->sendEdit($val['Catglossary']['id'], 'catglossaries') . '<br />';
          
-         echo $html->link($val['Catglossary']['title'], '/admin/glossaries/listing/'.$val['Catglossary']['id'], array("class"=>"largelink")) . '<br />';
-            echo $val['Catglossary']['description']  . '<br />';
+   echo $html->link($val['Catglossary']['title'], '/admin/catglossaries/items/'.$val['Catglossary']['id'], array("class"=>"largelink")) . '<br />'; 
+   echo $val['Catglossary']['description']  . '<br />';
             
-            //echo count($val['Glossary'])  . ' <b>items</b><br />';
-            echo '<p style="font-size:7pt">Status: '. $gags->setStatus($val['Catglossary']['status']) . '</p>';
-         echo $gags->confirmDel($val['Catglossary']['id'], 'catglossaries');
-       
-       echo '</div>';
-    }
+   //echo count($val['Glossary'])  . ' <b>items</b><br />';
+   echo '<p style="font-size:7pt">Status: '. $gags->setStatus($val['Catglossary']['status']) . '</p>';
+   echo $gags->confirmDel($val['Catglossary']['id'], 'catglossaries');
+   echo '</div>';
+ }
 ?>

trunk/app/views/glossaries/admin_listing.ctp

@@ -1 @@
-<?php
-//exit(print_r($data));
-
-if ( isset($javascript) ):
-  echo $html->charsetTag('UTF-8');
-  echo $javascript->link('prototype');
-  echo $javascript->link('scriptaculous.js?load=effects');
-endif;
-?>
 <script type="text/javascript">
    window.onload = timedMsg;

trunk/app/views/podcasts/admin_listing.ctp

@@ -3 +3 @@
 <?php echo $html->getCrumbs(' / '); ?>
 
-<div class="title_section"> <?php echo $othAuth->user('username') ?>'s Podcasts </div>
+<div class="title_section"> <?php echo $cU['User']['username']; ?>'s Podcasts </div>
 
-<p>
- <?php echo $html->link($html->image('actions/new.png', array("alt"=>"Add podcast", "title"=>"Add podcast")), '/admin/podcasts/add', null, false, false); ?>
-</p>
+ <?php echo $html->para(null, $html->link($html->image('actions/new.png', array("alt"=>"Add podcast", "title"=>"Add podcast")), '/admin/podcasts/add', null, false, false)); ?>
+
 
 <table class="tbadmin">