Changeset 771 for trunk/app/views

Timestamp:

09/20/08 15:32:48 (2 months ago)

Author:

aarkerio

Message:

New Unit Testing models

Location:

trunk/app/views

Files:

• elements/admin_menu.ctp (modified) (1 diff)
• elements/wikibar.ctp (modified) (4 diffs)
• entries/admin_start.ctp (modified) (1 diff)
• wikis/admin_edit.ctp (modified) (3 diffs)

trunk/app/views/elements/admin_menu.ctp

@@ -13 +13 @@
                                                                   $html->link(__('Forums', true), '/admin/catforums/listing'),
                                                                   $html->link(__('Messages', true), '/admin/messages/listing')
+                                                                  //$html->link(__('WikiPages', true), '/admin/wikis/listing')
                                                              ),
              $html->link('Webquests', '/admin/webquests/listing'),

trunk/app/views/elements/wikibar.ctp

@@ -1 @@
-
 <script type= "text/javascript">/*<![CDATA[*/
-// wiki_add('*','*','bold')
-function wiki_add(open_tag, close_tag, tag_text) {
+// wiki_add('--','--','underline')
+function wiki_add(open_tag, close_tag, tag_text) 
+{
   var text_element = document.getElementById('WikiContent');
 
@@ -15 +15 @@
     while (p1 > p0 && text_element.value.substring(p1-1, p1) == ' ') 
     {
-      p1--;
+      p1--;   // position
     }
-    
-    if (p1 > p0) 
+    if (p1 > p0)  // si en verdad hay texto en el textarea 
     {
       str = text_element.value.substring(p0, p1);
@@ -35 +34 @@
     text_element.focus();
     range = document.selection.createRange()
-      if (str == '') 
-      {
-    range.text = open_tag + tag_text + close_tag;
-    range.moveStart('character', -close_tag.length - tag_text.length );
-    range.moveEnd('character', -close_tag.length );
-       } 
-       else 
+    if (str == '') 
+    {
+       range.text = open_tag + tag_text + close_tag;
+       range.moveStart('character', -close_tag.length - tag_text.length );
+       range.moveEnd('character', -close_tag.length );
+    } 
+    else 
+    {
+       if (str.charAt(str.length - 1) == " ") 
        {
-     if (str.charAt(str.length - 1) == " ") 
-         {
       close_tag = close_tag + " ";
       str = str.substr(0, str.length - 1);
-     }
-     range.text = open_tag + str + close_tag;
-      }
+       }
+       range.text = open_tag + str + close_tag;
+    }
     range.select();
   } 
@@ -61 +60 @@
 </script>
 
-<div id="toolbar">
-<a href="#toolbar"><img onclick="wiki_add('*','*','bold');" src="/img/static/button_bold.png" alt="Bold" title="Bold" /></a> 
-<a href="#toolbar"><img onclick="wiki_add('**','**','italics');" src="/img/static/button_italic.png" alt="Italics"  /></a> 
-<a href="#toolbar"><img onclick="wiki_add('--','--','underline');" src="/img/static/button_underline.png" alt="Underline" title="Underline" /></a> 
-<a href="#toolbar"><img onclick="wiki_add('', '\\n#########','heading 1');" src="/img/static/button_headline.png" alt="Heading 1" /></a> 
-<a href="#toolbar"><img onclick="wiki_add('', '\\n=========','heading 2');" src="/img/static/button_hr.png" alt="Line" /></a> 
-<a href="#toolbar"><img onclick="wiki_add('', '\\n---------','heading 3');" src="/img/static/button_heading3.png" alt="Heading 3" /></a> 
-<a href="#toolbar"><img onclick="wiki_add('{', '}','image url');" src="/img/static/button_image.png" alt="Inline image" /></a> 
-<a href="#toolbar"><img onclick="wiki_add('[link url]', '[/]','link text');" src="/img/static/button_link.png" alt="Inline link" /></a>
+<div id="toolbar" style="padding:0;margin:15px 0 0 0;">
+<a href="#legend"><img onclick="wiki_add('\'\'\'','\'\'\'','bold');" src="/img/static/button_bold.png" class="wikibutton" alt="Bold" title="Bold" /></a> 
+<a href="#legend"><img onclick="wiki_add('\'\'','\'\'','italics');" src="/img/static/button_italic.png" class="wikibutton" alt="Italics"  /></a> 
+<a href="#legend"><img onclick="wiki_add('--','--','underline');" src="/img/static/button_underline.png" class="wikibutton" alt="Underline" title="Underline" /></a> 
+<a href="#legend"><img onclick="wiki_add('\n==', '==\n','heading 1');" src="/img/static/button_headline.png" class="wikibutton" alt="Heading 1" title="Headline 1" /></a> 
+<a href="#legend"><img onclick="wiki_add('', '\n----\n','');" src="/img/static/button_hr.png" class="wikibutton" alt="Line" title="Line" /></a> 
+<a href="#legend"><img onclick="wiki_add('[', ']','http://www.ejemplo.com|Título del enlace');" src="/img/static/button_extlink.png" class="wikibutton" alt="External Link" title="External link" /></a> 
+<a href="#legend"><img onclick="wiki_add('[[', ']]','Imagen:Ejemplo.jpg');" src="/img/static/button_image.png" class="wikibutton" alt="Inline image" title="Inline image" /></a> 
+<a href="#legend"><img onclick="wiki_add('[', ']','Link text');" src="/img/static/button_link.png" class="wikibutton" title="Inline link" alt="Inline link" /></a>
 </div>

trunk/app/views/entries/admin_start.ctp

@@ -30 +30 @@
  echo $html->div('main-item', $tmp, array('title'=>'Messages', 'onclick'=>"document.location.href='/admin/messages/listing'"));
 
- $tmp  = $html->link($html->image('wikis.png', array('title'=>'Wikis', 'alt'=>'Wikis')), '/admin/wikis/listing', null, null, false);
- $tmp .= $html->link('Wikis', '/admin/wikis/listing', array('title'=>'Wikis', 'class'=>'main-item-caption'));
- echo $html->div('main-item', $tmp, array('title'=>'Blog', 'onclick'=>"document.location.href='/admin/wikis/listing'"));
+// $tmp  = $html->link($html->image('wikis.png', array('title'=>'Wikis', 'alt'=>'Wikis')), '/admin/wikis/listing', null, null, false);
+// $tmp .= $html->link('Wikis', '/admin/wikis/listing', array('title'=>'Wikis', 'class'=>'main-item-caption'));
+// echo $html->div('main-item', $tmp, array('title'=>'Blog', 'onclick'=>"document.location.href='/admin/wikis/listing'"));
 
  $tmp  = $html->link($html->image('mmultimedia.png',array('title'=>__('Shared files', true), 'alt'=>__('Shared files', true))), '/admin/shares/listing', null, null, false);

trunk/app/views/wikis/admin_edit.ctp

@@ -6 +6 @@
 ?>
 <fieldset>
-  <legend><?php __('Edit Wiki'); ?></legend>
+  <legend id="legend"><?php __('Edit Wiki'); ?></legend>
 <?php  
 echo $form->input('Wiki.title', array('size' => 60, 'maxlength'=>80));
@@ -16 +16 @@
 echo $form->select('Wiki.vclassroom_id', $vclassrooms, null, null, false);
 
+echo $html->link($html->image('admin/myimages.jpg', array('alt'=>__('My Images', true), 'title'=>__('My Images',true))), '#', array("onclick"=>"javascript:window.open('/admin/images/listing/set', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false); 
+
 echo $this->element('wikibar');
+
 echo $form->textarea('Wiki.content', array('cols'=>100,'rows' =>20, 'class'=>'wikitext'));
-echo $html->div('optional',$form->label('Wiki.status', 'Status:').$form->checkbox('Wiki.status', array('value'=>1)));
+echo $form->label('Wiki.status', __('Status', true));
+echo $form->checkbox('Wiki.status', array('value'=>1));
 
-echo $html->div('optional',$form->label('Wiki.end', 'End:').$form->checkbox('Wiki.end', array('value'=>1)));
+echo $form->label('Wiki.end', __('End', true));
+echo $form->checkbox('Wiki.end', array('value'=>1));
 
-echo $html->div('submit', $form->end(__('Save', true)));
+echo $form->end(__('Save', true));
 ?>
 <script type="text/javascript">
@@ -34 +39 @@
 </fieldset>
 
-<?php echo $html->link('View revisions', '/admin/wikis/history/'.$this->data['Wiki']['id']); ?>
+<?php echo $html->link(__('View history', true), '/admin/wikis/history/'.$this->data['Wiki']['id']); ?>