Changeset 642

Timestamp:

07/11/08 14:28:03 (3 months ago)

Author:

aarkerio

Message:

Update FAQS

Location:

trunk/app

Files:

• controllers/replies_controller.php (modified) (4 diffs)
• locale/spa/LC_MESSAGES/default.po (modified) (1 diff)
• views/catfaqs/admin_listing.ctp (modified) (1 diff)
• views/faqs/admin_add.ctp (modified) (1 diff)
• views/faqs/admin_edit.ctp (modified) (1 diff)
• views/faqs/admin_listing.ctp (modified) (1 diff)

trunk/app/controllers/replies_controller.php

@@ -25 +25 @@
  public function add() 
  {
-   if (!empty($this->data['Reply']))
-   { 
+   if (!empty($this->data['Reply'])):
+ 
      $this->Sanitize = new Sanitize;
      
@@ -35 +35 @@
      $this->Reply->create();
      
-     if ($this->Reply->save($this->data['Reply']))
-     { 
-          $this->msgFlash('Reply added', $this->data['Reply']['redirect_to']);
-     }
-   } 
+     if ($this->Reply->save($this->data)): 
+          $this->msgFlash(__('Reply saved', true), $this->data['Reply']['redirect_to']);
+     endif;
+  endif; 
  }
  
@@ -46 +45 @@
  public function admin_edit($id = null)
  {
-    if (empty($this->data))
-    {
+   if (empty($this->data)):
+   
         $this->Reply->id = $id;
         
         $this->data = $this->Reply->read();
-    }
-    else
-    {
-        if ($this->Reply->save($this->data['Reply']))
-        {
-            $this->flash('Reply updated.','/admin/topics/listing/'.$topic_id);
-        }
-    }
+   else:
+   
+        if ($this->Reply->save($this->data['Reply'])):
+             $this->flash(__('Reply updated', true),'/admin/topics/listing/'.$this->data['Reply']['topic_id']);
+    endif;
+   endif;
  }
 
@@ -68 +65 @@
     $this->data['Reply']['id']     = $reply_id;
      
-    if ($this->Reply->save($this->data['Reply']))
-    {
+    if ($this->Reply->save($this->data['Reply'])):
        $this->msgFlash('Reply status changed', '/admin/topics/listing/'.$topic_id);
-    }
+    endif;
  }
 
  public function admin_delete($topic_id, $reply_id)
  {
-     if ( $this->Reply->del($reply_id) )
-     {
-        $this->msgFlash('Reply deleted','/admin/topics/listing/'.$topic_id);
-     }
+   if ( $this->Reply->del($reply_id) ):
+        $this->msgFlash(__('Data deleted', true),'/admin/topics/listing/'.$topic_id);
+   endif;
  }
 }

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

@@ -4 +4 @@
 msgid  "Groups"
 msgstr "Grupos"
+
+msgid  "Questions & answers"
+msgstr "Preguntas y respuestas"
+
+msgid  "New Question/Answer"
+msgstr "Nueva pregunta/respuesta"
+
+msgid  "Question"
+msgstr "Pregunta"
+
+msgid  "Answer"
+msgstr "Respuesta"
+
+msgid  "FAQ categories"
+msgstr "Categorías de preguntas y respuestas"
 
 msgid  "Email"

trunk/app/views/catfaqs/admin_listing.ctp

@@ -21 +21 @@
 foreach ($data as $val):
  $tmp  = $html->div('butonright', $gags->sendEdit($val['Catfaq']['id'], 'catfaqs'));
- $tmp .= $html->link($val['Catfaq']['title'], '/admin/faqs/listing/'.$val['Catfaq']['id']);
- $tmp .= $html->para(null,  $val['Catfaq']['description']);
+ $tmp .= $html->link($val['Catfaq']['title'], '/admin/faqs/listing/'.$val['Catfaq']['id'], array('style'=>'font-size:14pt;font-weight:bold;'));
+ $tmp .= $html->para(null,  $val['Catfaq']['description'], array('style'=>'font-weight:bold;'));
  $tmp .= $html->link($gags->setStatus($val['Catfaq']['status']),'/admin/catfaqs/change/'.$val['Catfaq']['status'].'/'.$val['Catfaq']['id']);
   $tmp .= $html->div('butonright', $gags->confirmDel($val['Catfaq']['id'], 'catfaqs'));

trunk/app/views/faqs/admin_add.ctp

@@ -1 @@
-<div class="title_section">Add new Question and Answer</div>
-
-<?php echo $form->create('Faq'); ?>
-<?php echo $form->hidden('Faq.catfaq_id', array('value'=>$catfaq_id)); ?>
+<?php 
+ echo $form->create('Faq'); 
+ echo $form->hidden('Faq.catfaq_id', array('value'=>$catfaq_id)); 
+?>
 
 <fieldset>
-   <legend>New Question/Answer</legend>
-   
- <?php 
-   echo $form->input('Faq.question', array("size" => 50, "maxlength" => 120)); 
-   echo $form->error('Faq.question', 'Question is required.') . '<br /><br />'; 
+   <legend><?php __('New Question/Answer');?></legend>  
+<?php 
+  echo $form->input('Faq.question', array('size' => 50, 'maxlength' => 120, 'label'=>__('Question', true))); 
+  echo $form->error('Faq.question', 'Question is required.') . '<br /><br />'; 
 
-   echo $form->label('Faq.answer', 'Answer:' ) . '<br />';
-   echo $form->textarea('Faq.answer', array("rows"=>"15", "cols"=>"60"));
-   echo $fck->load('FaqAnswer', 'Karamelo'); 
-   echo $form->error('Faq.answer', 'Answer is required.'); 
+  echo $form->label('Faq.answer', __('Answer',true) ) . '<br />';
+  echo $form->textarea('Faq.answer', array('rows'=>15, 'cols'=>60));
+  echo $fck->load('FaqAnswer', 'Basic'); 
+  echo $form->error('Faq.answer', 'Answer is required.'); 
+
+  echo $form->label('Faq.status', __('Published',true)) . '<br />';
+  echo $form->checkbox('Faq.status', array('value'=>1));
+  
+  echo $form->end(__('Save', true)); 
 ?>
-  <br /><br />
-  <?php  
-    echo $html->para(null, $form->label('Faq.status', 'Published:' ) . '<br />'. $form->checkbox('Faq.status'));
-  ?>
-  
-  <br />
-  </fieldset>
-  <?php echo $form->end('Send'); ?>
+</fieldset>

trunk/app/views/faqs/admin_edit.ctp

@@ -1 @@
-<?php echo $javascript->link('myfunctions'); ?>
-<?php echo $javascript->link('fckeditor/fckeditor'); ?> 
+<?php 
+echo $javascript->link('myfunctions'); 
+echo $javascript->link('fckeditor/fckeditor');
 
-<div class="spaced">
-
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->addCrumb('FAQs', '/admin/catfaqs/listing'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
+echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
+echo $html->addCrumb('FAQs', '/admin/catfaqs/listing');  
+echo $html->getCrumbs(' / ');
 
 
-<?php echo $html->formTag('/admin/faqs/edit/','post'); ?>
-<?php echo $html->hiddenTag('Faq/catfaq_id'); ?>
-<?php echo $html->hiddenTag('Faq/id'); ?>
+echo $form->create('Faq', array('action'=>'edit')); 
+echo $form->hidden('Faq.catfaq_id'); 
+echo $form->hidden('Faq.id'); 
+?>
 <fieldset>
-   <legend>Edit Faq</legend>
+   <legend><?php __('Edit FAQ');?></legend>
 <?php 
-  echo $form->labelTag('Faq/question', 'Question:' ) .'<br />'; 
-  echo $html->input('Faq/question', array("size" => 40, "maxlength" => 50)); 
-  echo $html->tagErrorMsg('Faq/question', 'Question is required.'); 
+  echo $form->input('Faq.question', array('size' => 40, 'maxlength' => 50, 'label'=>__('Question', true))); 
+  echo $form->error('Faq.question', 'Question is required.'); 
+
+  echo $form->label('Faq.answer', __('Answer',true)) . '<br />';
+  echo $form->textarea('Faq.answer', array('cols'=>70, 'rows'=>40));
+  echo $fck->load('FaqAnswer', 'Karamelo'); 
+  echo $form->error('Faq.answer', 'Answer is required.'); 
+
+  echo $form->label('Faq.status', __('Published', true) ) .'<br />';
+  echo $form->checkbox('Faq.status', array('value'=>1));
+ 
+ echo $form->label('Faq.end', __('End edition', true)).'<br />';
+ echo $form->checkbox('Faq.end', array('value'=>1));
+ 
+ echo $form->end(__('Save', true)); 
 ?>
-  <br />
-  
-  <p>
-  <?php 
-      echo $form->labelTag( 'Faq/answer', 'Answer:' ) . '<br />';
-      echo $html->textarea('Faq/answer', array("cols"=>80, "rows"=>45));
-      echo $fck->load('Faq/answer', 'Karamelo'); 
-      echo $html->tagErrorMsg('Faq/answer', 'Answer is required.'); 
-  ?>
-  <br />
-  </p>
-  
-  <p>
-  <?php echo $form->labelTag('Faq/status', 'Published:' );?><br />
-  <?php echo $html->checkbox('Faq/status', null, array("value"=>1)); ?>
-  <br />
-  <?php echo $form->labelTag('Faq/end', 'End edition:' );?><br />
-  <?php echo $html->checkbox('Faq/end', null, array("value"=>1)); ?>
-
-</p> 
-  <br />
-  <?php echo $html->submit('Save') ?>
 </fieldset>
-</form>
-</div>

trunk/app/views/faqs/admin_listing.ctp

@@ -4 +4 @@
   echo $javascript->link('fckeditor/fckeditor');
 endif;
-?>
-<script type="text/javascript">
-   window.onload = timedMsg;
-</script>
-<?php 
-$session->flash();
-echo $html->addCrumb('Control Tools', '/admin/entries/start');
-echo $html->addCrumb('FAQs', '/admin/catfaqs/listing'); 
-echo $html->getCrumbs(' / '); 
-?>
-<div class="title_section">Questions &amp; answers</div>
-<p>
-<?php
- echo '<div id="loading" style="display: none;">';
-                  echo $html->image("static/loading.gif", array("alt"=>"Loading"));
- echo '</div>';
+
+ echo $html->addCrumb('Control Panel', '/admin/entries/start');
+ echo $html->addCrumb('FAQs', '/admin/catfaqs/listing'); 
+ echo $html->getCrumbs(' / '); 
+
+ echo $html->div('title_section', __('Questions & answers', true));
+    
+ echo $html->div(null, $html->image("static/loading.gif", array('alt'=>'Loading')), array('id'=>'loading', 'style'=>'display:none'));
     
- echo  $ajax->link($html->image('actions/new.png', array("alt"=>"Add new FAQ", "title"=>"Add new FAQ")),'/admin/faqs/add/'.$catfaq_id, 
+ echo  $ajax->link($html->image('actions/new.png', array('alt'=>__('Add new', true), 'title'=>__('Add new', true))),'/admin/faqs/add/'.$catfaq_id, 
      array("update" => "updater","loading"=>"Element.show('loading');Element.hide('updater');", "complete"=>"Element.hide('loading');Effect.Appear('updater')"), 
                 null, false);
 
-echo $ajax->div('updater');
-echo $ajax->divEnd('updater');
-?></p>
-<?php
-foreach ($data as $val)
-{
-   echo '<div style="padding:6px 3px 28px 4px;margin:10px 0 5px 0;border:1px dotted gray;">';
-        echo '<div class="butonright">'. $gags->sendEdit($val['Faq']['id'], 'faqs')   . '</div>';
+echo $ajax->div('updater') . $ajax->divEnd('updater');
+
+foreach ($data as $val):
+   echo '<div style="padding:28px 6px 29px 5px;margin:10px 0 5px 0;border:1px dotted gray;">';
+        echo $html->div('butonright', $gags->sendEdit($val['Faq']['id'], 'faqs'));
         echo '<b>'.$val['Faq']['question'] . '</b><br />';
-        echo '<p style="margin-left:15px;">'. $val['Faq']['answer']  . '</p>';
-        echo '<div class="butonright">'. $gags->confirmDel($val['Faq']['id'], 'faqs') . '</div>';
+        echo $html->div(null, $val['Faq']['answer']);
+        echo $html->div('butonright', $gags->confirmDel($val['Faq']['id'], 'faqs'));
    echo '</div>';
-}
+endforeach;
 ?>