Changeset 764 for trunk/app

Timestamp:

09/09/08 20:29:18 (2 months ago)

Author:

aarkerio

Message:

Wiki editor

Location:

trunk/app

Files:

• views/entries/admin_start.ctp (modified) (1 diff)
• views/wikis/admin_add.ctp (modified) (1 diff)
• views/wikis/admin_edit.ctp (modified) (1 diff)
• views/wikis/admin_listing.ctp (modified) (1 diff)
• webroot/js/wikitoolbar.js (modified) (1 diff)

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_add.ctp

@@ -3 +3 @@
        <legend><?php __('Add Wiki');?></legend>
 <?php  
-echo $html->div('optional',$form->input('Wiki.title', array('size' => 60)));
-echo $html->div('optional',$form->label('Wiki.subject_id', 'Subject:').$form->select('Wiki.subject_id', $subjects, null, null, false));
-echo $html->div('optional',$form->label('Wiki.content', 'Content').$form->textarea('Wiki.content', array('cols' => 60, 'rows' => 10)));
-echo $html->div('optional',$form->label('Wiki.status', 'Status:').$form->checkbox('Wiki.status', array('value'=>1)));
+echo $html->div('optional',$form->input('Wiki.title', array('size'=>60, 'maxlength'=>80)));
+echo $html->div('optional',$form->label('Wiki.subject_id', __('Subject', true)).$form->select('Wiki.subject_id', $subjects, null, null, false));
+echo $html->div('optional',$form->label('Wiki.content', 'Content').$form->textarea('Wiki.content', array('cols' => 90, 'rows' => 20)));
+echo $html->div('optional',$form->label('Wiki.status', __('Published', true)).$form->checkbox('Wiki.status', array('value'=>1)));
 
-echo $html->div('submit', $form->end('Add'));
+echo $html->div('submit', $form->end(__('Save', true)));
 ?>
 </fieldset>

trunk/app/views/wikis/admin_edit.ctp

@@ -8 +8 @@
   <legend><?php __('Edit Wiki'); ?></legend>
 <?php  
-echo $html->div('optional',$form->input('Wiki.title', array('size' => 60)));
-echo $html->div('optional',$form->label('Wiki.subject_id', 'Subject:').$form->select('Wiki.subject_id', $subjects, null, null, false));
-echo $html->div('optional',$form->label('Wiki.content', 'Content').$form->textarea('Wiki.content', array('cols'=>100,'rows' =>15, 'class'=>'wikitext')));
+echo $form->input('Wiki.title', array('size' => 60, 'maxlength'=>80));
+echo $form->label('Wiki.subject_id', __('Subject', true));
+echo $form->select('Wiki.subject_id', $subjects, null, 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)));
 

trunk/app/views/wikis/admin_listing.ctp

@@ -1 @@
-<script type="text/javascript">
-window.onload = timedMsg;
-</script>
 <?php 
-//die(debug($session->read('Auth.User.email')));
-
-$session->flash(); 
  
-echo $html->addCrumb('Control Tools', '/admin/entries/start');
+echo $html->addCrumb('Control Panel', '/admin/entries/start');
 echo $html->getCrumbs(' / '); 
 
-echo $html->div('title_section', __('Wiki pages', true)); 
+echo $html->div('title_section', __('WikiPages', true)); 
 
-echo $html->para(null, $html->link($html->image('actions/new.png', array('alt'=>'Add wiki', 'title'=>'Add wiki')), '/admin/wikis/add', null, false, false));
-
+echo $html->para(null, $html->link($html->image('actions/new.png', array('alt'=>__('Add new', true), 'title'=>__('Add new', true))), '/admin/wikis/add', null, false, false));
 ?>
 <table class="tbadmin">
 <?php
-
-$th = array ('Edit', 'Title', 'Status', 'Delete');
+$th = array(__('Edit', true), __('Title', true), __('Status', true), __('Delete', true));
 echo $html->tableHeaders($th);
 foreach ($data as $val):
-  $tr = array (
-           $gags->sendEdit($val['Entry']['id'], 'Entry'),
-           $val['Entry']['title'],
-           $html->link($gags->setStatus($val['Entry']['status']), '/admin/entries/change/'.$val['Entry']['id'].'/'.$val['Entry']['status']),
-           $gags->confirmDel($val['Entry']['id'], 'Entry')
-           );
+  $tr = array(
+         $gags->sendEdit($val['Wiki']['id'], 'Wiki'),
+         $val['Wiki']['title'],
+         $html->link($gags->setStatus($val['Wiki']['status']),'/admin/wikis/change/'.$val['Wiki']['id'].'/'.$val['Wiki']['status']),
+         $gags->confirmDel($val['Wiki']['id'], 'Wiki')
+         );
        
            echo $html->tableCells($tr, array("class"=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"), 

trunk/app/webroot/js/wikitoolbar.js

@@ -1 @@
-function addWikiFormattingToolbar(textarea) {
-  if ((typeof(document["selection"]) == "undefined")
-   && (typeof(textarea["setSelectionRange"]) == "undefined")) {
-    return;
-  }
-  
-  var toolbar = document.createElement("div");
-  toolbar.className = "wikitoolbar";
-
-  function addButton(id, title, fn) {
-    var a = document.createElement("a");
-    a.href = "#";
-    a.id = id;
-    a.title = title;
-    a.onclick = function() { try { fn() } catch (e) { } return false };
-    a.tabIndex = 400;
-    toolbar.appendChild(a);
-  }
-
-  function encloseSelection(prefix, suffix) {
-    textarea.focus();
-    var start, end, sel, scrollPos, subst;
-    if (typeof(document["selection"]) != "undefined") {
-      sel = document.selection.createRange().text;
-    } else if (typeof(textarea["setSelectionRange"]) != "undefined") {
-      start = textarea.selectionStart;
-      end = textarea.selectionEnd;
-      scrollPos = textarea.scrollTop;
-      sel = textarea.value.substring(start, end);
-    }
-    if (sel.match(/ $/)) { // exclude ending space char, if any
-      sel = sel.substring(0, sel.length - 1);
-      suffix = suffix + " ";
-    }
-    subst = prefix + sel + suffix;
-    if (typeof(document["selection"]) != "undefined") {
-      var range = document.selection.createRange().text = subst;
-      textarea.caretPos -= suffix.length;
-    } else if (typeof(textarea["setSelectionRange"]) != "undefined") {
-      textarea.value = textarea.value.substring(0, start) + subst +
-                       textarea.value.substring(end);
-      if (sel) {
-        textarea.setSelectionRange(start + subst.length, start + subst.length);
-      } else {
-        textarea.setSelectionRange(start + prefix.length, start + prefix.length);
-      }
-      textarea.scrollTop = scrollPos;
-    }
-  }
-
-  addButton("strong", "Bold text: '''Example'''", function() {
-    encloseSelection("'''", "'''");
-  });
-  addButton("em", "Italic text: ''Example''", function() {
-    encloseSelection("''", "''");
-  });
-  addButton("heading", "Heading: == Example ==", function() {
-    encloseSelection("\n== ", " ==\n", "Heading");
-  });
-  addButton("link", "Link: [http://www.example.com/ Example]", function() {
-    encloseSelection("[", "]");
-  });
-  addButton("code", "Code block: {{{ example }}}", function() {
-    encloseSelection("\n{{{\n", "\n}}}\n");
-  });
-  addButton("hr", "Horizontal rule: ----", function() {
-    encloseSelection("\n----\n", "");
-  });
-  addButton("np", "New paragraph", function() {
-    encloseSelection("\n\n", "");
-  });
-  addButton("br", "Line break: [[BR]]", function() {
-    encloseSelection("[[BR]]\n", "");
-  });
-
-  textarea.parentNode.insertBefore(toolbar, textarea);
-}
-
-// Add the toolbar to all <textarea> elements on the page with the class
-// 'wikitext'.
-var re = /\bwikitext\b/;
-var textareas = document.getElementsByTagName("textarea");
-for (var i = 0; i < textareas.length; i++) {
-  var textarea = textareas[i];
-  if (textarea.className && re.test(textarea.className)) {
-    addWikiFormattingToolbar(textarea);
-  }
-}