Permalink
Browse files

Item12192:

   * removing local redundant button styles to 
   * deprecating NATEDIT_THEME in favor of jquery-ui theming
   


git-svn-id: http://svn.foswiki.org/trunk@15768 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information...
MichaelDaum MichaelDaum
MichaelDaum authored and MichaelDaum committed Oct 29, 2012
1 parent 01669cb commit 5da9eea4dfc6aa49486867adb5d4a466ad1e94cd
@@ -1,16 +1,5 @@
%META:TOPICINFO{author="ProjectContributor" comment="save topic" date="1349941111" format="1.1" version="5"}%
---+!! Natural Edit Plugin
<!--
PLEASE DO NOT EDIT THIS TOPIC
It is automatically generated from the subversion repository, and any
changes you make will simply be overwritten the next time a release is
generated.
Instead, you could check your fix in, raise a bug in the Bugs web, or
mail the author.
-->
%TOC%
---++ Description
@@ -71,6 +60,7 @@ is sufficient.
| Release: | %$RELEASE% |
| Version: | %$VERSION% |
| Change History: | |
| 29 Oct 2012 | removed local button styles to allow theming via jquery-ui; use of NATEDIT_THEME is deprecated from now on|
| 22 Oct 2012 | implemented improved list editing; rewrite of modal dialogs to use jquery-ui-dialog instead of the old simplemodal library |
| 10 Jul 2012 | fixed character encoding when saving a topic on a non-utf8 site using a REST handler |
| 21 Feb 2012 | only add one strikeone nonce to the http header |
@@ -19,8 +19,8 @@ use Foswiki::Func ();
use Foswiki::Plugins ();
use Foswiki::Validation ();
use version; our $VERSION = version->declare("v6.11");
our $RELEASE = '6.11';
use version; our $VERSION = version->declare("v6.20");
our $RELEASE = '6.20';
our $NO_PREFS_IN_TOPIC = 1;
our $SHORTDESCRIPTION = 'A Wikiwyg Editor';
our $baseWeb;
@@ -10,8 +10,6 @@ lib/Foswiki/Plugins/NatEditPlugin/FormList.pm 0644
lib/Foswiki/Plugins/NatEditPlugin/RestSave.pm 0644
locale/NatEditPlugin/de.po 0644
locale/NatEditPlugin/Foswiki.pot 0644
pub/System/NatEditPlugin/default/btn_left.gif 0644
pub/System/NatEditPlugin/default/btn_right.gif 0644
pub/System/NatEditPlugin/default/buttons_sprite.gif 0644
pub/System/NatEditPlugin/default/buttons_sprite.png 0644
pub/System/NatEditPlugin/default/Makefile 0644
@@ -15,6 +15,7 @@
package Foswiki::Plugins::NatEditPlugin::NATEDIT;
use strict;
use warnings;
use Foswiki::Plugins::JQueryPlugin::Plugin;
our @ISA = qw( Foswiki::Plugins::JQueryPlugin::Plugin );
@@ -50,7 +51,8 @@ sub new {
javascript => [ 'edit.js', 'jquery.natedit.js' ],
dependencies => [
'textboxlist', 'form', 'validate', 'ui',
'ui::dialog', 'tabpane', 'ui::autocomplete', 'focus'
'ui::dialog', 'tabpane', 'ui::autocomplete', 'focus',
'button',
],
),
$class
@@ -72,10 +74,21 @@ sub init {
return unless $this->SUPER::init();
my $theme = Foswiki::Func::getPreferencesValue("NATEDIT_THEME");
if ($theme) {
Foswiki::Func::writeWarning(
"use of NATEDIT_THEME is deprecated. please use a jquery-ui theme."
);
}
else {
$theme = 'default';
}
Foswiki::Func::addToZone(
"head", "JQUERYPLUGIN::NATEDIT::THEME",
<<"HERE", 'JQUERYPLUGIN::NATEDIT' );
<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/NatEditPlugin/%IF{\"defined NATEDIT_THEME\" then=\"%NATEDIT_THEME%\" else=\"default\"}%/styles.css?version=$this->{version}' type='text/css' media='all' />
<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/NatEditPlugin/$theme/styles.css?version=$this->{version}' type='text/css' media='all' />
HERE
}
Binary file not shown.
Binary file not shown.
@@ -96,34 +96,3 @@
line-height:22px;
font-size:12px;
}
.natEditBottomBar a:hover,
.natEditBottomBar a {
background-color:inherit;
background-image:url(btn_right.gif);
background-position:top right;
background-repeat:no-repeat;
text-decoration:none;
cursor:pointer;
display:block;
float:left;
line-height:23px;
padding:0px;
margin:0px 8px 0px 0px;
}
.natEditBottomBar li span {
background-image:url(btn_left.gif);
background-position:top left;
background-repeat:no-repeat;
cursor:pointer;
display:block;
float:left;
line-height:23px;
margin:0px 3px 0px 0px;
padding:0px 8px;
}
.natEditBottomBar a:active {
background-position:bottom right;
}
.natEditBottomBar li a:active span {
background-position:bottom left;
}

0 comments on commit 5da9eea

Please sign in to comment.