Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[20324] branches/experimental/coe
|
From: <jon...@us...> - 2009-07-24 01:38:53
|
Revision: 20324
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20324&view=rev
Author: jonnybradley
Date: 2009-07-24 01:38:38 +0000 (Fri, 24 Jul 2009)
Log Message:
-----------
[MOD] Quicktags/Toolbars revamp, part 2 (really)
Load/save fixed
Admin still requires mootools and no javascript disabled mode
More icons
Wiki mode mostly functional
Modified Paths:
--------------
branches/experimental/coe/css/admin.css
branches/experimental/coe/lib/quicktags/quicktagslib.php
branches/experimental/coe/templates/tiki-admin_quicktags.tpl
branches/experimental/coe/tiki-admin_quicktags.php
Added Paths:
-----------
branches/experimental/coe/pics/icons/anchor.png
branches/experimental/coe/pics/icons/cut.png
branches/experimental/coe/pics/icons/page_copy.png
branches/experimental/coe/pics/icons/page_paste.png
Modified: branches/experimental/coe/css/admin.css
===================================================================
--- branches/experimental/coe/css/admin.css 2009-07-23 21:53:28 UTC (rev 20323)
+++ branches/experimental/coe/css/admin.css 2009-07-24 01:38:38 UTC (rev 20324)
@@ -141,6 +141,10 @@
border: solid thin black;
}
+.quicktags-admin .rows {
+ min-height: 490px;
+}
+
.quicktags-admin .li { display: block; }
.quicktags-admin .full {
@@ -168,4 +172,14 @@
margin-right: 4px;
}
+.qt-wys {
+ font-style: italic;
+}
+
+.qt-wiki {
+ font-weight: bold;
+}
+
+
+
/* end from ui-revamp branch */
Modified: branches/experimental/coe/lib/quicktags/quicktagslib.php
===================================================================
--- branches/experimental/coe/lib/quicktags/quicktagslib.php 2009-07-23 21:53:28 UTC (rev 20323)
+++ branches/experimental/coe/lib/quicktags/quicktagslib.php 2009-07-24 01:38:38 UTC (rev 20324)
@@ -47,6 +47,29 @@
return array_merge( array(
'-',
+ 'bold',
+ 'italic',
+ 'strike',
+ 'sub',
+ 'sup',
+ 'tikilink',
+ 'link',
+ 'anchor',
+ 'color',
+ 'bgcolor',
+ 'center',
+ 'table',
+ 'rule',
+ 'pagebreak',
+ 'blockquote',
+ 'h1',
+ 'h2',
+ 'h3',
+ 'image',
+ 'list',
+ 'numlist',
+ 'specialchar',
+ 'smiley',
'templates',
'cut',
'copy',
@@ -73,29 +96,6 @@
'fontname',
'fontsize',
'source',
- 'bold',
- 'italic',
- 'strike',
- 'sub',
- 'sup',
- 'tikilink',
- 'link',
- 'anchor',
- 'color',
- 'bgcolor',
- 'center',
- 'table',
- 'rule',
- 'pagebreak',
- 'blockquote',
- 'h1',
- 'h2',
- 'h3',
- 'image',
- 'list',
- 'numlist',
- 'specialchar',
- 'smiley',
'fullscreen',
'enlarge',
'reduce',
@@ -157,6 +157,7 @@
function __construct() // {{{
{
$this->setWysiwygToken('-');
+ $this->setIcon('pics/icons/tree_vertline.png');
} // }}}
function getWikiHtml( $areaName ) // {{{
@@ -167,22 +168,23 @@
class QuicktagFckOnly extends Quicktag
{
- private function __construct( $token ) // {{{
+ private function __construct( $token, $icon = 'pics/icons/shading.png' ) // {{{
{
$this->setWysiwygToken( $token );
+ $this->setIcon($icon);
} // }}}
public static function fromName( $name ) // {{{
{
switch( $name ) {
case 'templates':
- return new self( 'Templates' );
+ return new self( 'Templates', 'pics/icons/page_white_stack.png' );
case 'cut':
- return new self( 'Cut' );
+ return new self( 'Cut', 'pics/icons/cut.png' );
case 'copy':
- return new self( 'Copy' );
+ return new self( 'Copy', 'pics/icons/page_copy.png' );
case 'paste':
- return new self( 'Paste' );
+ return new self( 'Paste', 'pics/icons/page_paste.png' );
case 'pastetext':
return new self( 'PasteText' );
case 'pasteword':
@@ -304,16 +306,13 @@
$syntax = '~~white,black:text~~';
break;
default:
- $label = tra($tagName);
- $icon = tra('pics/icons/shading.png');
- $wysiwyg = $tagName;
- $syntax = '';
+ return;
}
$tag = new self;
$tag->setLabel( $label )
->setWysiwygToken( $wysiwyg )
- ->setIcon( $icon )
+ ->setIcon( !empty($icon) ? $icon : 'pics/icons/shading.png' )
->setSyntax( $syntax );
return $tag;
@@ -384,16 +383,13 @@
$syntax = '{img src= width= height= link= }';
break;
default:
- $label = tra($tagName);
- $icon = tra('pics/icons/shading.png');
- $wysiwyg = $tagName;
- $syntax = '';
+ return;
}
$tag = new self;
$tag->setLabel( $label )
->setWysiwygToken( $wysiwyg )
- ->setIcon( $icon )
+ ->setIcon( !empty($icon) ? $icon : 'pics/icons/shading.png' )
->setSyntax( $syntax );
return $tag;
@@ -425,17 +421,13 @@
$syntax = '#text';
break;
default:
- $label = tra($tagName);
- $icon = tra('pics/icons/shading.png');
- $wysiwyg = $tagName;
- $syntax = '';
- break;
+ return;
}
$tag = new self;
$tag->setLabel( $label )
->setWysiwygToken( $wysiwyg )
- ->setIcon( $icon )
+ ->setIcon( !empty($icon) ? $icon : 'pics/icons/shading.png' )
->setSyntax( $syntax );
return $tag;
@@ -478,16 +470,13 @@
}
break;
default:
- $label = tra($tagName);
- $icon = tra('pics/icons/shading.png');
- $wysiwyg = $tagName;
- $syntax = '';
+ return;
}
$tag = new self;
$tag->setWysiwygToken( $wysiwyg )
->setLabel( $label )
- ->setIcon( $icon )
+ ->setIcon( !empty($icon) ? $icon : 'pics/icons/shading.png' )
->setList( $list );
foreach( $prefs as $pref ) {
$tag->addRequiredPreference( $pref );
@@ -621,7 +610,7 @@
}
$tag = new self;
- $tag->setLabel( $info['name'] )
+ $tag->setLabel( str_ireplace('wikiplugin_', '', $info['name'] ))
->setIcon( $icon )
->setWysiwygToken( self::getToken( $name ) )
->setPluginName( $name );
@@ -759,7 +748,7 @@
foreach( $group as $tag ) {
$groupHtml .= $tag->getWikiHtml( $areaName );
}
-
+
if( ! empty($groupHtml) ) {
$param = empty($lineHtml) ? '' : ' style="border-left: double gray; height: 20px;"';
$lineHtml .= "<span$param>$groupHtml</span>";
Added: branches/experimental/coe/pics/icons/anchor.png
===================================================================
(Binary files differ)
Property changes on: branches/experimental/coe/pics/icons/anchor.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: branches/experimental/coe/pics/icons/cut.png
===================================================================
(Binary files differ)
Property changes on: branches/experimental/coe/pics/icons/cut.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: branches/experimental/coe/pics/icons/page_copy.png
===================================================================
(Binary files differ)
Property changes on: branches/experimental/coe/pics/icons/page_copy.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: branches/experimental/coe/pics/icons/page_paste.png
===================================================================
(Binary files differ)
Property changes on: branches/experimental/coe/pics/icons/page_paste.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Modified: branches/experimental/coe/templates/tiki-admin_quicktags.tpl
===================================================================
--- branches/experimental/coe/templates/tiki-admin_quicktags.tpl 2009-07-23 21:53:28 UTC (rev 20323)
+++ branches/experimental/coe/templates/tiki-admin_quicktags.tpl 2009-07-24 01:38:38 UTC (rev 20324)
@@ -15,7 +15,7 @@
<div class="rows">
{foreach from=$rows item=i}
- <label>{tr}Line{/tr} {$i}:</label>
+ <label for="row-{$i|escape}">{tr}Row{/tr} {$i}:</label>
<ul id="row-{$i|escape}" class="row"></ul>
{/foreach}
</div>
Modified: branches/experimental/coe/tiki-admin_quicktags.php
===================================================================
--- branches/experimental/coe/tiki-admin_quicktags.php 2009-07-23 21:53:28 UTC (rev 20323)
+++ branches/experimental/coe/tiki-admin_quicktags.php 2009-07-24 01:38:38 UTC (rev 20324)
@@ -26,22 +26,27 @@
$section = reset($sections);
}
+$auto_query_args = array('section');
+
if( isset($_REQUEST['save'], $_REQUEST['pref']) ) {
$prefName = 'toolbar_' . $section;
$tikilib->set_preference( $prefName, $_REQUEST['pref'] );
}
$current = $tikilib->get_preference( 'toolbar_' . $section );
-$current = preg_replace( '/\s+/', '', $current );
-$current = trim( $current, '/' );
-$current = explode( '/', $current );
-$loadedRows = count($current);
-foreach( $current as & $line ) {
- $line = explode( ',', $line );
+if (!empty($current)) {
+ $current = preg_replace( '/\s+/', '', $current );
+ $current = trim( $current, '/' );
+ $current = explode( '/', $current );
+ $loadedRows = count($current);
+ foreach( $current as & $line ) {
+ $line = explode( ',', $line );
+ }
+
+ $rowCount = max($loadedRows, 1) + 1;
+} else {
+ $rowCount = 1;
}
-
-$rowCount = max($loadedRows, 2) + 1;
-
$init = '';
$setup = '';
$map = array();
@@ -91,15 +96,23 @@
$setup
var seri = function(element) {
- return element.innerHTML;
+ if (element.hasChildNodes()) {
+ return element.lastChild.nodeValue;
+ } else {
+ return element.innerHTML;
+ }
};
window.quicktags_sortable.saveRows = function() {
window.quicktags_sortable.removeLists($('full-list'));
var lists = [];
var ser = window.quicktags_sortable.serialize(false, seri );
- for( var i = 0; ser.length > i; ++i )
- lists.push( ser[i].join(',') );
+ if (typeof(ser[0]) == 'object' && (ser[0] instanceof Array)) {
+ for( var i = 0; ser.length > i; ++i )
+ lists.push( ser[i].join(',') );
+ } else {
+ lists.push( ser.join(',') );
+ }
$('qt-form-field').value = lists.join('/');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|