Author: ajaquith
Date: Sun Aug 3 20:08:32 2008
New Revision: 682247
URL: http://svn.apache.org/viewvc?rev=682247&view=rev
Log:
Rolled back checkins from Stripes branch that somehow got into trunk!
Modified:
incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/skin.css
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/Smart/skin.css
Modified: incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Wiki.jsp?rev=682247&r1=682246&r2=682247&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Wiki.jsp Sun Aug 3 20:08:32 2008
@@ -15,11 +15,11 @@
if(!wikiContext.hasAccess( response )) return;
String pagereq = wikiContext.getName();
- // Redirect if the request was for a 'special page'
- String redirect = wiki.getWikiActionBeanFactory().getSpecialPageReference(
pagereq );
+ // Redirect if request was for a 'special page'
+ String redirect = wiki.getRedirectURL( wikiContext );
if( redirect != null )
{
- response.sendRedirect( wikiContext.getViewURL( redirect ) );
+ response.sendRedirect( redirect );
return;
}
Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js?rev=682247&r1=682246&r2=682247&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js Sun Aug 3
20:08:32 2008
@@ -20,7 +20,7 @@
*/
/*
-Javascript routines to support JSPWiki
+JavaScript routines to support JSPWiki
Since v.2.6.0
Uses mootools v1.1, with following components:
@@ -760,7 +760,7 @@
(i==0) ? tab.removeClass('hidetab') :
tab.addClass('hidetab');
- new
Element('div',{'styles':{'clear':'both'}}).inject(tab);
+ new
Element('div',{'class':'clearbox'}).inject(tab);
var title = clazz.substr(4).deCamelize();
//drop 'tab-' prefix
new Element('a', {
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/skin.css
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/skin.css?rev=682247&r1=682246&r2=682247&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/skin.css
(original)
+++
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/OrderedList/skin.css
Sun Aug 3 20:08:32 2008
@@ -307,6 +307,7 @@
#tools .collapsetitle:hover {
background:#fc3;
}
+
#toolbuttons span {
border:1px solid #fc3;
}
@@ -390,7 +391,9 @@
color:#c7ff70;
border-bottom:none;
}
+
/* +++ 625 Table of contents plugin +++ */
+
/* +++ 630 Weblog and weblogarchive plugins +++ */
.weblogentryheading, .weblogentryfooter {
color:#c7ff70;
@@ -420,6 +423,7 @@
}
/* +++ 800 JSPWiki JSP Taglibs +++ */
+
/* +++ 805 CalendarTag +++ */
table.calendar * {
font-size:0.9em;
@@ -509,6 +513,7 @@
color:#c30 !important;
}
+
/* +++ 920 Collapsible lists +++ */
.collapseBullet,
.collapseOpen,
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/skins/Smart/skin.css
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/skins/Smart/skin.css?rev=682247&r1=682246&r2=682247&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/skins/Smart/skin.css
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/skins/Smart/skin.css
Sun Aug 3 20:08:32 2008
@@ -1,5 +1,5 @@
/* SMART skin
- * additional .css on top of jspwiki.css
+ * Additional .css on top of jspwiki.css
* Dirk Frederickx, May 07
*/
@@ -79,6 +79,14 @@
h2,h3,h4 {
color:#c00;
}
+.editsection a:link, .editsection a:active, .editsection a:visited {
+ border:none;
+ color:#ccc;
+}
+.editsection a:hover {
+ background:#fff7c0;
+ color:#999;
+}
/* +++ 220 Lists and bullets +++ */
/* +++ 225 Forms, Labels, form-values and form-help +++ */
@@ -176,6 +184,16 @@
.textarea-resizer {
background:#fad112;
}
+#findSuggestionMenu {
+ color:#c30;
+ background-color:#fad112;
+ border:4px solid #fad112;
+}
+#findSuggestionMenu .hover {
+ background-color:#fff7c0;
+}
+
+
/* +++ 440 Favorites +++ */
.userbox .username {
padding:4px 0 4px 22px;
@@ -247,58 +265,6 @@
a.tool:hover, .btn:hover {
background-color:#fad112 !important;
}
-#toolbar a.tool {
- border:none;
- background-repeat:no-repeat;
- background-color:transparent;
- background-position:3px 3px;
- height:16px;
- width:16px;
- text-indent:20px;
- overflow:hidden;
-}
-#tbH1 { background-image:url("images/text_heading_1.png"); }
-#tbH2 { background-image:url("images/text_heading_2.png"); }
-#tbH3 { background-image:url("images/text_heading_3.png"); }
-#tbB { background-image:url("images/text_bold.png"); }
-#tbI { background-image:url("images/text_italic.png"); }
-#tbLink { background-image:url("images/link.png"); }
-#tbMONO { background-image:url("images/text_allcaps.png"); }
-/*
-#tbColor { background-image:url("images/paintbrush.png"); }
-#tbBackground { background-image:url("images/paintcan.png"); }
-*/
-#tbPRE { background-image:url("images/page_white_code.png"); }
-#tbCODE { background-image:url("images/page_white_code_red.png"); }
-#tbHR { background-image:url("images/text_horizontalrule.png"); }
-#tbBR { background-image:url("images/pilcrow.png"); }
-#tbDL { background-image:url("images/application_form.png"); }
-#tbSUP { background-image:url("images/text_superscript.png"); }
-#tbSUB { background-image:url("images/text_subscript.png"); }
-#tbSTRIKE { background-image:url("images/text_strikethrough.png"); }
-#tbUL { background-image:url("images/text_list_bullets.png"); }
-#tbOL { background-image:url("images/text_list_numbers.png"); }
-#tbLEFT { background-image:url("images/text_align_left.png"); }
-#tbCENTER { background-image:url("images/text_align_center.png"); }
-#tbRIGHT { background-image:url("images/text_align_right.png"); }
-#tbJUST { background-image:url("images/text_align_justify.png"); }
-#tbQUOTE { background-image:url("images/text_padding_left.png"); }
-#tbIMG { background-image:url("images/picture.png"); }
-#tbTABLE { background-image:url("images/table.png"); }
-#tbTOC { background-image:url("images/book.png"); }
-#tbTAB { background-image:url("images/tab.png"); }
-#tbSIGN { background-image:url("images/text_signature.png"); }
-
-/*
-#tbTIME { background-image:url("images/time.png"); }
-#tbPLUGIN { background-image:url("images/plugin.png"); }
-#tbCUT { background-image:url("images/cut.png"); }
-#tbCOPY { background-image:url("images/page_copy.png"); }
-#tbPASTE { background-image:url("images/page_white_paste.png"); }
-#tbPASTE.mark { background-image:url("images/page_paste.png"); }
-#tbUNDO { }
-#tbREDO { }
-*/
/* +++ 475 PageContent.jsp +++ */
.banner {
@@ -309,6 +275,9 @@
color:white;
padding:0.5em 0.25em;
}
+#sneakpreviewheader {
+ background-color:#fff7c0;
+}
/* +++ 475 PreviewContent - "This is a preview" comment +++ */
/* +++ 480 PreferencesContent, LoginContent, GroupContent +++ */
@@ -493,9 +462,8 @@
}
.categoryTitle, .categoryText {
background:#fad112;
- margin:0;
}
-.categoryTitle:hover, .categoryText li:hover {
+.categoryPopup .hover {
background:#fff7c0;
}
.categoryLink:link, .categoryLink:active, .categoryLink:hover,
.categoryLink:visited {
