Return-Path: X-Original-To: apmail-jspwiki-commits-archive@www.apache.org Delivered-To: apmail-jspwiki-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D0C0B18BCE for ; Sat, 27 Jun 2015 09:11:37 +0000 (UTC) Received: (qmail 63653 invoked by uid 500); 27 Jun 2015 09:11:37 -0000 Delivered-To: apmail-jspwiki-commits-archive@jspwiki.apache.org Received: (qmail 63635 invoked by uid 500); 27 Jun 2015 09:11:37 -0000 Mailing-List: contact commits-help@jspwiki.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jspwiki.apache.org Delivered-To: mailing list commits@jspwiki.apache.org Received: (qmail 63626 invoked by uid 99); 27 Jun 2015 09:11:37 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Jun 2015 09:11:37 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 3337DAC012B for ; Sat, 27 Jun 2015 09:11:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1687892 - in /jspwiki/trunk: ./ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/resources/templates/ jspwiki-war/src/main/scripts/behaviors/ jspwiki-war/src/main/scripts/wiki-edit/ jspwiki-war/src/main/scripts/wiki/ jspwiki... Date: Sat, 27 Jun 2015 09:11:36 -0000 To: commits@jspwiki.apache.org From: brushed@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150627091137.3337DAC012B@hades.apache.org> Author: brushed Date: Sat Jun 27 09:11:36 2015 New Revision: 1687892 URL: http://svn.apache.org/r1687892 Log: 2.10.2-svn-18 - Few small fixes and tweaks on haddock template Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.eot (with props) jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.svg (with props) jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.ttf (with props) jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.woff (with props) Modified: jspwiki/trunk/ChangeLog jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Viewer.Slimbox.js jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.Behaviors.js jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Search.less jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.SearchBox.less jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Sidebar.jsp jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp Modified: jspwiki/trunk/ChangeLog URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/ChangeLog (original) +++ jspwiki/trunk/ChangeLog Sat Jun 27 09:11:36 2015 @@ -1,3 +1,14 @@ +2015-06-27 Dirk Frederickx (brushed AT apache DOT org) + + * 2.10.2-svn-18 + + Small fixes and tweaks on haddock template + * Few improvements of the Reader template + * SLIMBOX support for interwiki links + * Small style tweaks + * Fix UserBox issue in non-default language + + 2015-06-26 Siegfried Goeschl (sgoeschl@apache.org) * Fixed JSPWIKI-888 Enable cache timeouts for Portable JSPWiki. 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=1687892&r1=1687891&r2=1687892&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 Sat Jun 27 09:11:36 2015 @@ -72,7 +72,7 @@ public final class Release { *

* If the build identifier is empty, it is not added. */ - public static final String BUILD = "17"; + public static final String BUILD = "18"; /** * This is the generic version string you should use when printing out the version. It is of Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties (original) +++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties Sat Jun 27 09:11:36 2015 @@ -357,7 +357,7 @@ prefs.user.orientation.left=Sidebar / Co prefs.user.orientation.right=Content / Sidebar prefs.user.orientation.hidden=No Sidebar prefs.user.layout=Page Layout -prefs.user.layout.fluid=Fluid +prefs.user.layout.fluid=Full Width prefs.user.layout.fixed=Fixed Width #prefs.user.editorareaheight=Editor area height //not user anymore prefs.user.sectionediting=Section Editing @@ -621,7 +621,6 @@ javascript.group.validName=Please provid javascript.category.title=Click to show category [{0}] ... -javascript.slimbox.caption=Go to {0} javascript.slimbox.info=Image {0} of {1} javascript.slimbox.error=

Error

There was a problem with your request.
Please try again javascript.slimbox.directLink=Direct Link to the target @@ -632,6 +631,7 @@ javascript.slimbox.close=Close × javascript.slimbox.close.title=Close [Esc] javascript.slimbox.caption= Direct link to {0} javascript.slimbox.btn=Click to view {0} +javascript.slimbox.size=Size: {0}px x {1}px javascript.sectionediting.label=Section Overview Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties (original) +++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties Sat Jun 27 09:11:36 2015 @@ -111,7 +111,7 @@ editgroup.instructions=Deze pagina laat De persoon die een nieuwe groep aanmaakt, is automatisch lid van de groep. editgroup.saveerror=Fout. De groep kan niet worden bewaard  editgroup.memberlist=Leden van deze groep. Voeg elke gebruikersnaam \ - of wikinaam toe, op een niewe lijn. + of wikinaam toe, op een niewe lijn. editgroup.savehelp=Klik “Bewaar groep” om deze groep als \ {0} te bewaren. U kunt deze naam gebruiken bij de beveiliging van de wiki pagina's. editgroup.submit.save=Bewaar groep @@ -153,7 +153,7 @@ find.scope.attach=Bijlagen group.tab=Toon Groep #group.areyousure=Weet U zeker dat U de groep "{0}" definitief wilt verwijderen ? \ -# Gebruikers zouden pagina's met ACLs die naar deze groep wijzen niet meer kunnen raadplegen \\n\\n +# Gebruikers zouden pagina's met ACLs die naar deze groep wijzen niet meer kunnen raadplegen \\n\\n group.doesnotexist=Deze groep bestaat niet. group.createsuggestion=Klik hier om deze nieuwe groep {0} group.createit=aan te maken @@ -355,6 +355,7 @@ actions.systeminfo=JSPWiki Systeem Infor actions.systeminfo.title=Toon JSPWiki Systeem Informatie actions.rawpage=Toon Pagina Bron actions.rawpage.title=Toon ongeformatteerde pagina opmaak +actions.showreaderview=Lezersweergave openen # PageContent.jsp @@ -377,7 +378,7 @@ prefs.tab.profile=Profiel prefs.cookies=Uw voorkeuren worden bewaard in de cookies van de browser prefs.user.skin=Layout -prefs.user.orientation=Wijzig de Layout Orientatie +prefs.user.orientation=Wijzig de Layout Orientatie prefs.user.orientation.left=Links prefs.user.orientation.right=Rechts #prefs.user.editorareaheight=Wijzig Editor hoogte @@ -410,7 +411,7 @@ prefs.clear.description=\ Klik ‘Verwijder Gebruikers Instellingen’ om deze browser cookies te verwijderen. \
\ Merk op dat deze actie alle gebruikers instellingen permanent verwijdert. - + prefs.newprofile=Maak een nieuw gebruikersprofiel prefs.oldprofile=Bewerk uw gebruikerprofiel. @@ -424,7 +425,7 @@ prefs.loginname.cannotset.new=De login n Gelieve eerst in te loggen, met de credentials die door uw administrator werden aangeleverd. prefs.loginname.cannotset.exists=De login naam kan niet worden ingegeven omdat \ de credentials worden beheerd door de web-container, niet door wiki. - + prefs.password=Wachtwoord * prefs.password.description=Geef uw wachtwoord. Dit veld mag niet leeg zijn prefs.password2=Bevestig Wachtwoord * @@ -436,7 +437,7 @@ prefs.fullname.description=Deze naam kan prefs.email=E-mail adres prefs.email.description= (optioneel). Bij verlies van het wachtwoord, \ kunt U een nieuw random wachtwoord aanvragen dat naar dit email adres zal worden gezonden. - + prefs.cookie.info=Deze wiki bewaart uw identiteit automatisch in een browser cookie, \ zonder bijkomende authenticatie. Hiervoor moet de browser cookies accepteren van deze website. \ Klik “Bewaar Gebruikersprofiel” om het cookie op uw browser te bewaren. @@ -505,9 +506,10 @@ preview.tab=Preview preview.info=Dit is een preview! \ Klik “Verdergaan” om terug naar de editor te gaan, \ of klik “Bewaar” als U tevreden bent met het resultaat. - + # SearchBox.jsp -sbox.search.submit=Snelle navigatie +sbox.search.submit=Snelle zoekactie +sbox.search.fullsearch=Druk op Enter voor een volledige zoekactie... sbox.view=Toon sbox.view.title=Toon de geselecteerde pagina sbox.edit=Bewerk @@ -612,7 +614,7 @@ editor.fck.noscript=Javascript moet acti editor.wikiwizard.noscript=Javascript moet actief zijn in de browser om de WikiWizard editor te kunnen gebruiken editor.wikiwizard.noapplet=Java Applets worden niet ondersteund door deze browser. \ Gelieve Java te downloaden, zodat U de WikiWizard editor kunt gebruiken. - + #blog texts in various JSPs blog.commenttitle=Blog Commentaren blog.backtomain=Terug naar de hoofd Blog pagina @@ -634,7 +636,7 @@ javascript.edit.areyousure=Indien u de B javascript.favs.show=Click om favorieten weer te geven javascript.favs.hide=Click om favorieten te verbergen - + javascript.quick.edit=[Bewerk] javascript.quick.edit.title=Bewerk sectie {0}... Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Viewer.Slimbox.js URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Viewer.Slimbox.js?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Viewer.Slimbox.js (original) +++ jspwiki/trunk/jspwiki-war/src/main/scripts/behaviors/Viewer.Slimbox.js Sat Jun 27 09:11:36 2015 @@ -35,7 +35,7 @@ DOM structure: (start code) div#slmbx div.modal //semi transparent screen overlay - div.viewport(.spin) //img, object or iframe element is inserted here + div.viewport(.loading) //img, object or iframe element is inserted here a.controls.caption a.controls.next a.controls.prev @@ -56,9 +56,8 @@ Viewer.Slimbox = new Class({ close: "×", next: ">", //« Next prev: "<", //» Previous - nofm: "[{0}/{1}]", //[page/#pages] - size: " ({0}px × {1}px)", // (height x width) - caption: " Go to {0}" + nofm: "[{0}/{1}] ", //[page/#pages] + size: "Size: {0}px x {1}px" // (height x width) }, keys: { close: ["esc", "x", "c"], @@ -85,7 +84,7 @@ Viewer.Slimbox = new Class({ "div.slmodal", { events: { click: clickFn } }, "div.viewport", { attach: [self, "viewport"], events: { "click:relay(a)": clickFn } }, [ //insert viewable iframe/object/img ... - controls + "caption", + controls + "caption.external", controls + "next", { html: hints.next }, controls + "prev", { html: hints.prev }, controls + "close", { html: hints.close } @@ -262,7 +261,8 @@ Viewer.Slimbox = new Class({ self.get(".caption").set({ href: url, html: ( many ? hints.nofm.xsubs( cursor + 1, max) : "" ) + - hints.caption.xsubs( el.title || el.alt || el.get("text")/*||""*/) + (el.title || el.alt || el.get("text") || "" ) + }); self.viewport.addClass("loading"); @@ -290,8 +290,8 @@ Viewer.Slimbox = new Class({ self.preload = preload; - //append viewport dimensions in px to the caption - caption.set("html", caption.get("html") + self.options.hints.size.xsubs(width, height) ); + //caption.set("html", caption.get("html") + self.options.hints.size.xsubs(width, height) ); + caption.set("title", self.options.hints.size.xsubs(width, height) ); // viewport has css set to { top:50%, left:50% } for automatic centered positioning viewport Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js (original) +++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki-edit/Wiki.Snips.js Sat Jun 27 09:11:36 2015 @@ -446,6 +446,7 @@ Wiki.Snips = { pills:"Pills", prettify: "Prettify syntax highlighter", scrollable: "Scrollable Preformatted block", + "scrollable-image": "Scrollable Wide Images", //reflection: "Image with reflection", slimbox: "Slimbox Viewer ", //"under-construction": "
", 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=1687892&r1=1687891&r2=1687892&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 Sat Jun 27 09:11:36 2015 @@ -243,8 +243,9 @@ function filterJSPWikiLinks(element){ // img:not([src$=/attachment_small.png]):not(.outlink) ::jspwiki small icons // a[href].attachment, // a[href].external, - // a[href].wikipage - "img:not([src$=/attachment_small.png]):not(.outlink),a[href].attachment,a[href].external,a[href].wikipage" + // a[href].wikipage, + // a[href].interwiki + "img:not([src$=/attachment_small.png]):not(.outlink),a[href].attachment,a[href].external,a[href].wikipage, a[href].interwiki" ); } @@ -255,7 +256,7 @@ wiki.once("body", function( /*elements*/ hints: { //use defaults as much as possible btn: "slimbox.btn".localize(), - caption: " Go to: {0}" //FIXME: "slimbox.caption".localize() + size: "slimbox.size".localize() } }); }) Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js (original) +++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js Sat Jun 27 09:11:36 2015 @@ -408,8 +408,7 @@ var Wiki = { //encoding: utf-8, onSuccess: function( responseText ){ - //var x = JSON.decode( responseText ); - //console.log(x.length,responseText,x); + console.log(responseText, JSON.decode( responseText ) ); callback( JSON.parse( responseText ) ) }, Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less (original) +++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Content.less Sat Jun 27 09:11:36 2015 @@ -84,8 +84,10 @@ DOM Structure: .clearfix; & > h2, & > h3, & > h4, { margin-top:0; } } +.page-content { + margin:0 @padding-base-horizontal @padding-base-vertical @padding-base-horizontal; +} -.page-content { margin:0 0 0 @padding-base-horizontal; } /* Section: page-footer Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Search.less URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Search.less?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Search.less (original) +++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.Search.less Sat Jun 27 09:11:36 2015 @@ -62,7 +62,6 @@ form#searchform2 + div { } //.fragment_ellipsis { font-weight:bold; } CHECKME ? not used anymore - //.nosearchresult { .warning; display:table-cell; } } .searchmatch { .highlight; } 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=1687892&r1=1687891&r2=1687892&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 Sat Jun 27 09:11:36 2015 @@ -107,3 +107,4 @@ DOM Structure: .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; } Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less (original) +++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Template.View.less Sat Jun 27 09:11:36 2015 @@ -58,7 +58,7 @@ DOM structure: (start code) div.header div.topline - div.application-logo + div.pull-left a.logo.href jspωiki //link to the home page of this wiki div.userbox @@ -74,13 +74,13 @@ DOM structure: a.btn.btn-link.prefs Prefs form#searchform.searchbox.pull-right.form-inline - input#query.form-control[type="text"][placeholder="Quick Navigation"] - - button#searchSubmit.btn[type="submit"] + input#query.form-control[type="text"][placeholder="To search, type ahead"] ul.dropdown-menu.pull-right[data-hover-parent="searchbox"] - li - li.findpages ... + li.dropdown-header + button#searchSubmit.btn[type="submit"] For full search, hit enter... + li.findpages ...create & clone buttons + li.findpages ...other search results li.divider li.recents ... li.recents.clear ... @@ -110,10 +110,11 @@ DOM structure: padding-right: @padding-base-horizontal; } - .page-content { margin:0 @padding-base-horizontal; } } +.titlebox.alert { margin:0; } + .header, .footer { .clearfix(); position: relative; @@ -180,6 +181,9 @@ a.logo { text-align: center; a { text-decoration:none; } } +.reader .pagename { + font-size: 6em; +} //JSPWiki-s breadcrumb - do not inherit bootstraps breadcrumbs .breadcrumb { @@ -197,6 +201,7 @@ a.logo { //background:rgba(255,255,255,0.05); } + .footer { //background: @wiki-footer-bg; padding:@padding-base-vertical @padding-base-horizontal; @@ -206,6 +211,9 @@ a.logo { .copyright, .wiki-version { .small; } +.reader .copyright { + margin: 2em 0; +} .feed { Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less (original) +++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/Viewer.Slimbox.less Sat Jun 27 09:11:36 2015 @@ -116,7 +116,7 @@ DOM Structure: //&.fade { .opacity(0); } //&.in { .opacity(.5); } } - &.active .slmodal { .opacity(.5); } + &.active .slmodal { .opacity(@slimbox-backdrop-opacity); } //modal viewport.. .viewport { @@ -136,7 +136,8 @@ DOM Structure: .transition(all .4s ease); // default background setting, the actual background-image is set by slimbox.js - background:transparent no-repeat center center; + //background:transparent no-repeat center center; + background:rgba(255,255,255,.3) no-repeat center center; .box-shadow (@slimbox-viewport-corona); @@ -159,7 +160,7 @@ DOM Structure: font-family: @slimbox-font-family; color: @slimbox-text-color; background: @slimbox-control-bg; - .box-shadow (@slimbox-viewport-corona); + //.box-shadow (@slimbox-viewport-corona); cursor:pointer; text-align: center; Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less (original) +++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/type.less Sat Jun 27 09:11:36 2015 @@ -246,7 +246,7 @@ img { //img.attlink // Utility class to support un-scaled, scrollable images, -.scroll, .xflow { +.scroll, .scrollable-image { overflow:scroll; pre, img.inline { width:auto; max-width:none; } @@ -382,25 +382,6 @@ Style: CAPTCHA tables and images } -/* -Style: spin; loading animation - Reusable class to indicate background processing or loading of ajax content. - - A background image is positioned at the right-hand side of the enclosing element. - Alternative: use CSS loading animation - -Example: -> span.spin (type ahead) - -*/ -.spin { - background:url("@{imagePath}/loading-bar.gif") no-repeat center center !important; - //width:16px; - //height:16px; - //margin:0 0.5em;*/ -} - - //utility class .under-construction { display:block; Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less (original) +++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/default/variables.less Sat Jun 27 09:11:36 2015 @@ -52,8 +52,8 @@ @font-family-sans-serif: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; //softer gray-tones -@pre-bg: #f2f2f2; -@pre-border-color: #e5e5e5; +@pre-bg: #f7f7f9; //#f2f2f2; +@pre-border-color: #e1e1e8; //#e5e5e5; @panel-default-border: @pre-border-color; @panel-default-heading-bg: @pre-bg; @@ -120,7 +120,11 @@ @viewer-box-border-color: @table-border-color; // Viewer.Slimbox -@slimbox-viewport-corona: 7px 7px 70px rgba(255,255,255,.5); +@slimbox-viewport-corona: 0 0 5em 1em rgba(255,255,255,.5); +//@slimbox-viewport-corona: 2px 2px 10px rgba(0,0,0,.5), 0 0 0 4000px rgba(0,0,0,.3); +//@slimbox-viewport-corona: 0 0 5em 1em rgba(255,255,255,.5),0 0 0 999em rgba(255,255,255,.7); +//@slimbox-viewport-corona: 0 0 5em 1em rgba(255,255,255,.5),0 0 0 999em rgba(0,0,0,.3); +@slimbox-backdrop-opacity: 0.3; @slimbox-font-family: @wiki-header-font-family; @slimbox-font-size: 40px; //@carousel-control-font-size; //20px; Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp (original) +++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Header.jsp Sat Jun 27 09:11:36 2015 @@ -27,13 +27,13 @@ String frontpage = c.getEngine().getFrontPage(); %> -[{InsertPage page=TitleBox class=titlebox }] +[{InsertPage page=TitleBox class='titlebox alert' }]
- +
@@ -43,7 +43,7 @@
    • - +
    Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp (original) +++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PageContent.jsp Sat Jun 27 09:11:36 2015 @@ -30,7 +30,7 @@ <%-- Main Content Section --%> <%-- This has been source ordered to come first in the markup (and on small devices) but to be to the right of the nav on larger screens --%> -
    +
    Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Sidebar.jsp URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Sidebar.jsp?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Sidebar.jsp (original) +++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/Sidebar.jsp Sat Jun 27 09:11:36 2015 @@ -27,17 +27,6 @@
    -<%-- move this to the content of the LeftMenu page - -[{If page='{$username}Favorites' exists='true' - -%%accordion -! [My Favorites|{$username}Favorites] -[{InsertPage page='{$username}Favorites' }] -%% }] - - ---%>
    Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp (original) +++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/UserBox.jsp Sat Jun 27 09:11:36 2015 @@ -40,13 +40,18 @@
  • - + <%-- asserted or authenticated --%> - ${username} + + ${username} + + + ${username} + Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp (original) +++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp Sat Jun 27 09:11:36 2015 @@ -44,7 +44,7 @@ - +
    Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp?rev=1687892&r1=1687891&r2=1687892&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp (original) +++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/raw/ViewTemplate.jsp Sat Jun 27 09:11:36 2015 @@ -14,10 +14,15 @@ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations - under the License. + under the License. --%> <%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %> + + +<%-- ie6 needs next line --%> + + <% response.setContentType("text/plain; charset=UTF-8"); %> 
     

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp?rev=1687892&r1=1687891&r2=1687892&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/ViewTemplate.jsp Sat Jun 27 09:11:36 2015
@@ -59,16 +59,10 @@ String.I18N.PREFIX = "javascript.";
 
 
 
-
-  
-    
-  
-  
-    
-  
-  
-    
-  
+
+<%-- ie6 needs next line --%>
+
+
 
 <%-- FIXME: for now, reuse haddock's stylesheet --%>
 
 
-
+
 
 
    
 
   
    
   
    
+  
    
 
 
    
 

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.eot
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.eot?rev=1687892&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.eot
------------------------------------------------------------------------------
    svn:mime-type = application/vnd.ms-fontobject

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.svg
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.svg?rev=1687892&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.svg
------------------------------------------------------------------------------
    svn:mime-type = image/svg+xml

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.ttf
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.ttf?rev=1687892&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.ttf
------------------------------------------------------------------------------
    svn:mime-type = application/x-font-ttf

Added: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.woff
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.woff?rev=1687892&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/reader/fonts/FontJspwiki.woff
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream