You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2015/07/05 19:20:07 UTC
svn commit: r1689265 - in /jspwiki/trunk: ./
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/scripts/behaviors/ jspwiki-war/src/main/scripts/wiki/
jspwiki-war/src/main/styles/haddock/default/
Author: brushed
Date: Sun Jul 5 17:20:06 2015
New Revision: 1689265
URL: http://svn.apache.org/r1689265
Log:
2.10.2-svn-23
* [JSPWIKI-895] Haddock template links contain raw URL information when printed
* [JSPWIKI-518] Saving after editing a section will return you to that section
* Formatting of the quick search dropdown for FireFox
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js
jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Viewer.js
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Findpages.js
jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.SearchBox.less
jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1689265&r1=1689264&r2=1689265&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sun Jul 5 17:20:06 2015
@@ -1,3 +1,16 @@
+2015-07-05 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.2-svn-23
+
+ * [JSPWIKI-895] Haddock template links contain raw URL information when printed
+ including a few tweaks on the print css
+
+ * [JSPWIKI-518] Saving after editing a section will return you to that section
+
+ * Improved formatting of the Quick Navigation drop-down to show the text and the
+ search score on a single line. (Firefox)
+
+
2015-06-30 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.2-svn-22
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1689265&r1=1689264&r2=1689265&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sun Jul 5 17:20:06 2015
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "22";
+ public static final String BUILD = "23";
/**
* This is the generic version string you should use when printing out the version. It is of
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js?rev=1689265&r1=1689264&r2=1689265&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Tabs.js Sun Jul 5 17:20:06 2015
@@ -63,11 +63,11 @@ DOM structure after: (based on Bootstra
(start code)
ul.nav.nav-tabs(.nav-pills)
li
- a[href="#home"] FirstTab
+ a FirstTab
li
- a[href="#profile"] SecondTab
+ a SecondTab
li
- a[href="#messages"] ThirdTab
+ a ThirdTab
div.tab-content
div.tab-pane.active[id="FirstTab"] ...
@@ -94,15 +94,21 @@ var Tab = new Class({
while( pane = panes[i++] ){
- items.push("li", [ "a", { text: this.getName( pane ) } ]);
-
+ items.push("li", [
+ "a", {
+ id: String.uniqueID(),
+ text: this.getName( pane ),
+ events: { click: this.show}
+ }
+ ]);
}
if( items[0] ){
items[0] += ".active";
- [this.options.nav, {events: {"click:relay(a)": this.show}}, items]
+ [this.options.nav, {}, items]
+// [this.options.nav, {events: {"click:relay(a)": this.show}}, items]
.slick()
.inject(container, "before");
@@ -161,16 +167,26 @@ var Tab = new Class({
/*
Click-handler to toggle the visibilities of the tab panes.
*/
- show: function(event){
+ show: function( event ){
var active = "active",
nav = this.getParent("ul"),
- index = nav.getElements("a").indexOf(this);
+ index = nav.getElements("a").indexOf(this),
+ tabpane;
+
- event.stop();
nav.getChildren().removeClass(active)[index].addClass(active);
- nav.getNext().getChildren().removeClass(active)[index].addClass(active);
+
+ tabpane = nav.getNext().getChildren().removeClass(active)[index].addClass( active );
+
+ if( event ){
+
+ event.stop();
+
+ }
+
}
+
});
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Viewer.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Viewer.js?rev=1689265&r1=1689264&r2=1689265&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Viewer.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Viewer.js Sun Jul 5 17:20:06 2015
@@ -198,7 +198,7 @@ Viewer.LIB.append([
//add some mp3/audio player here
- ["facebook.com", function(url){
+ ["facebook.com/v/", function(url){
url = "http://www.facebook.com/v/" + url.split("v=")[1].split("&")[0];
return {
url: url,
@@ -237,7 +237,8 @@ Viewer.LIB.append([
};
}],
- ["dailymotion.com", function(url){
+
+ ["dailymotion.com/video", function(url){
return {
src: "http://www.dailymotion.com/embed/video/" + url.split("/")[4].split("_")[0],
//url:url,
@@ -313,6 +314,18 @@ Viewer.LIB.append([
};
}],
+
+//http://codepen.io/loktar00/pen/fczsA
+//<iframe src="//codepen.io/loktar00/embed/fczsA?height=350&theme-id=1&default-tab=result" ></iframe>
+
+ ["http://codepen.io/[^/]/pen/", function(url){
+ return {
+ src: url.replace("/pen/","/embed/")+"?height=400",
+ width: 800,
+ height: 400
+ };
+ }],
+
["https?://", function(url){
return {
//default : catch iframe urls ; allow scrolling of eg external site"s
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Findpages.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Findpages.js?rev=1689265&r1=1689264&r2=1689265&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Findpages.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Findpages.js Sun Jul 5 17:20:06 2015
@@ -61,7 +61,7 @@ Wiki.Findpages = new Class({
self.query = element.getParent("form").query.observe( self.search );
self.element = element; //ul.dropdown menu
- self.element.addEvent("click:relay([name=cloney])", function(){
+ self.element.addEvent("click:relay(#cloney)", function(e){
this.getParent("a").href = self.toUrl(self.getValue(), true, this.checked);
@@ -114,12 +114,10 @@ Wiki.Findpages = new Class({
elements.push( "li.findpages", [
"a", { href: self.toUrl(value, true), title: "sbox.create".localize(value) }, [
- "span.createpage", { text: value }, [
- "div.btn.btn-danger.btn-xs.pull-right", [
- "input[type=checkbox][name=cloney]",
- "span", { text: "sbox.clone".localize() }
- ]
- ]
+ "label.btn.btn-danger.btn-xs.pull-right", { for:"cloney", text: "sbox.clone".localize()}, [
+ "input#cloney[name=cloney][type=checkbox]"
+ ],
+ "span.createpage", { text: value }
]
]);
@@ -131,8 +129,8 @@ Wiki.Findpages = new Class({
elements.push( "li.findpages", [
"a", { href: self.toUrl( item.page ) }, [
- "span", { text: item.page },
- "span.badge.pull-right", { text: item.score }
+ "span.badge.pull-right", { text: item.score },
+ "span", { text: item.page }
]
]);
}
Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js?rev=1689265&r1=1689264&r2=1689265&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js Sun Jul 5 17:20:06 2015
@@ -117,8 +117,8 @@ Behavior:Accordion
> %%accordion .. /%
> %%leftAccordion .. /%
> %%rightAccordion .. /%
-> %%pillsAccordion .. /%
> %%tabbedAccordion .. /%
+> %%pillsAccordion .. /%
*/
.add("[class^=accordion]", Accordion)
.add("[class^=leftAccordion]", Accordion, { type: "pills", position: "pull-left" })
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.SearchBox.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.SearchBox.less?rev=1689265&r1=1689264&r2=1689265&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.SearchBox.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.SearchBox.less Sun Jul 5 17:20:06 2015
@@ -85,15 +85,14 @@ DOM Structure:
li.findpages
a[title="Create <page>"]
+ label.btn.btn-danger.btn-xs.pull-right
+ input#cloney.pull-left[type=checkbox] Clone this page
span.createpage <page-name>
- div.btn.btn-danger.btn-xs.pull-right
- input[type=checkbox][name=cloney]
- span Clone this page
li.findpages
a[href]
- span <page>
span.badge.pull-right <score>
+ span <page>
li.divider
@@ -105,6 +104,12 @@ DOM Structure:
(end)
*/
-.findpages .pull-right { margin-left: 1em; } //minimal space text and badge/buttons
-.findpages a[href*="&clone="] .createpage { font-weight:bold; }
-.findpages [name=cloney] { margin-right:.5em; }
+.findpages {
+
+ a[href*="&clone="] .createpage { font-weight:bold; }
+
+ //some space between checkbox, .btn, .badge and text
+ .pull-right { margin-left:.5em; }
+ #cloney { margin-left:.5em;}
+
+}
Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less?rev=1689265&r1=1689264&r2=1689265&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/print.less Sun Jul 5 17:20:06 2015
@@ -45,11 +45,18 @@ Inherit parts of Bootstrap:print.less ;
box-shadow: none !important;
}
+ .pagename {
+ font-size:@font-size-h1;
+ line-height:1;
+ margin-bottom:1em;
+ }
+
a,
a:visited {
text-decoration: underline;
}
+/* seems too intrusive
a[href]:after {
content: " (" attr(href) ")";
font-size:85%;
@@ -62,6 +69,7 @@ Inherit parts of Bootstrap:print.less ;
a[href^="#"]:after {
content: "";
}
+*/
pre,
blockquote {
@@ -182,7 +190,7 @@ a[href='#top'] {
.page-break {
//height:0;
page-break-before:always;
- //border:none;
+ border:none;
margin:0;
}