jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brus...@apache.org
Subject svn commit: r1569540 - in /jspwiki/trunk: ./ jspwiki-war/src/main/java/org/apache/wiki/ jspwiki-war/src/main/scripts/dynamic-styles/ jspwiki-war/src/main/scripts/wiki/ jspwiki-war/src/main/styles/haddock/ jspwiki-war/src/main/webapp/templates/haddock/
Date Tue, 18 Feb 2014 22:07:39 GMT
Author: brushed
Date: Tue Feb 18 22:07:39 2014
New Revision: 1569540

URL: http://svn.apache.org/r1569540
Log:
2.10.1-svn-7 : various small fixes on the HADDOCK template (jsp/css/js) :

Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
    jspwiki/trunk/jspwiki-war/src/main/scripts/dynamic-styles/Viewer.Carousel.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Category.js
    jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Category.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Collapsible.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.Content.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.View.less
    jspwiki/trunk/jspwiki-war/src/main/styles/haddock/grid.less
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/ViewTemplate.jsp

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1569540&r1=1569539&r2=1569540&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Feb 18 22:07:39 2014
@@ -1,5 +1,21 @@
 2014-02-18  Dirk Frederickx (brushed AT apache DOT org)
 
+       * 2.10.1-svn-7  
+       
+       * Various small fixes on the HADDOCK template (jsp/css/js) :
+       
+       * Fixing %%category dropdowns which were clipped when inside a %%accordion.
+         Replacing js based animation by css3 animation to show/hide the popup.
+       
+       * Fixing bug when saving the Preferences (detected by Harry)
+       
+       * Changed fixed-width layout into fluid layout, occupying all screen real-estate.
+         (this could become a user-preference setting in the future)  
+         Slightly decreasing the size of the sidebar.
+       
+                  
+2014-02-18  Dirk Frederickx (brushed AT apache DOT org)
+
        * 2.10.1-svn-6
        
        * Fixing the JSONRPCMAnager.emitJSONCall(..) so that it now renders 

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=1569540&r1=1569539&r2=1569540&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 Tue Feb 18 22:07:39
2014
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "6";
+    public static final String     BUILD         = "7";
     
     /**
      *  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/dynamic-styles/Viewer.Carousel.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/dynamic-styles/Viewer.Carousel.js?rev=1569540&r1=1569539&r2=1569540&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/dynamic-styles/Viewer.Carousel.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/dynamic-styles/Viewer.Carousel.js Tue Feb 18
22:07:39 2014
@@ -61,7 +61,7 @@ Viewer.Carousel = new Class({
             t = 'transitionend';
 
         options = self.setOptions(options).options;
-        console.log('CAROUSEL Options: ',options);
+        //console.log('CAROUSEL Options: ',options);
         
         self.css3 = Element.Events[t] ? t : null;
         self.element = options.container;
@@ -72,8 +72,6 @@ Viewer.Carousel = new Class({
 
     build: function(elements, width, height){
 
-        console.log("CAROUSEL BUILD: ",elements.length,width,height);
-
         var self = this,
             items = [], indicators = [],
             cycle = self.options.cycle,
@@ -83,7 +81,6 @@ Viewer.Carousel = new Class({
 
         $$(elements).each( function(el,idx){ 
         
-            console.log(height,el.height, width, el.width);
             items.push('div.item',[ 
                 el, { styles: {
                     //add padding to center the item inside its container, but still fill
100% of the available space

Modified: jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Category.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Category.js?rev=1569540&r1=1569539&r2=1569540&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Category.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Category.js Tue Feb 18 22:07:39 2014
@@ -30,26 +30,27 @@ DOM structure after:
 
 Wiki.Category = function(element, pagename, xhrURL){
 
-    var popup;
-    'span.cage'.slick().wraps(element).grab(popup = 'div.popup.hide'.slick());
+    function poppy(event){
+    
+        var popup = this.getNext();
+        event.stop();
+        popup.swapClass('hide', 'loading');
+        element.set('title','').removeEvents();
 
+        new Request.HTML({
+            url: xhrURL,
+            data: { page:pagename },
+            update: popup,
+            onSuccess: function(){ popup.swapClass('loading', 'active'); }
+        }).send();    
+    }
+    
+    ['span',['div.popup.hide']].slick().wraps(element,'top');
+    
     element.set({
         'class': 'category-link',
         title: 'category.title'.localize( pagename ),
-        events: { click: function(event){
-            
-            event.stop();
-            popup.swapClass('hide', 'loading').onHover( /*popup.getParent()*/ );
-            element.set('title','').removeEvents();
-
-            new Request.HTML({
-                url: xhrURL,
-                data: { page:pagename },
-                update: popup,
-                onSuccess: function(){ popup.swapClass('loading', 'active').fade(0.9); }
-            }).send();
-            
-        } }
+        events: { click: poppy }
     });
 
 }

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=1569540&r1=1569539&r2=1569540&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/scripts/wiki/Wiki.js Tue Feb 18 22:07:39 2014
@@ -108,7 +108,6 @@ var Wiki = {
         wiki.once = behavior.once.bind(behavior);
         wiki.update = behavior.update.bind(behavior);
 
-
         //wiki.get = function(name){ return wiki.prefs.get(name); };
         wiki.get = prefs.get.bind(prefs);
         //wiki.set = function(name,value){ return wiki.prefs.set(name,value); };

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Category.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Category.less?rev=1569540&r1=1569539&r2=1569540&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Category.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Category.less Tue Feb 18 22:07:39 2014
@@ -60,45 +60,46 @@ Style: Popup
     _width:240px;
 
     color:@white;
-    padding:.5em;    
-}
-
-
-.category .popup { 
-
-    margin-top:3px;  //slightly move popup down with 3px under the category-link
     padding:0;
+ 
+    .transition(all 1s ease);
+    .opacity(0);
+    visibility:hidden;
 
-    br { display:none; }
-
+    ul { .list-unstyled; }
     a {
         display: block;
         padding: 0.1em .75em;
         color: @white;
         text-decoration: none;
         text-shadow: 1px 1px 0 @tooltip-bg;
-
+ 
         &:hover {
             background:@black;
             background:fade(@tooltip-bg,25%);
             border-radius:@border-radius-base;
             _background-color:@black;
         }
-    }
-
-    .categoryTitle { .hide; }
+    } 
     
-    .categoryText > ul {
-        margin:0;
-        padding:0;
-        list-style:none;
-        _background:url("@{imagePath}/tip.png") bottom right;
-    }
-    li {
-        margin:0;padding:0;
+    &.loading {
+        height:1em; overflow:hidden;
+        .progress-striped .progress-bar;
+        .progress.active .progress-bar;
     }
-
 }
-//.category .active { .... }
+.category:hover .popup.loading, 
+.category:hover .popup.active { 
+    .opacity(.9); 
+    visibility:visible; 
+}
+
+.category .popup { 
+
+    margin-top:3px;  //slightly move popup down with 3px under the category-link
 
+    //FIXME: remove this from AJAXCategory.jsp
+    .categoryTitle { .hide; }
+     
+}
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Collapsible.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Collapsible.less?rev=1569540&r1=1569539&r2=1569540&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Collapsible.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Collapsible.less Tue Feb 18 22:07:39
2014
@@ -19,43 +19,37 @@ DOM structure:
     outline:0;
     float:left;
     width:2em;
-
-    // normal bullet, without child lists
-    font-family:@font-family-monospace;
     line-height:1.4; //heuristic, for vertical
-    &:after { content:"\2022"; }
-    text-align:center;
-    color:@link-color;
     
-/*  TEXT BULLETS - obsolete
-    &.xpand:after { content:"-"; }
-    &.clpse:after { content:"+"; }
-*/
     // triangular bullets 
-    &.xpand, &.clpse {
-        cursor:pointer;
-        width:0;
-        height:0;
-        border:.4em solid transparent; 
-        border-radius: @border-radius-base; //smooth edges
+    width:0;
+    height:0;
+    border:.4em solid transparent; 
+    border-radius: @border-radius-base; //smooth edges
+    border-left-color: @text-color;
+    border-right: none;
+    margin: .3em .9em .3em .7em;
+        
+    &.clpse {
+        cursor: pointer;
+        border-left-color: @link-color;
+        &:hover { border-left-color: @link-hover-color; }
     }
     &.xpand {
-        border-top-color:@link-color;
-        border-bottom:none;
-        margin:.5em .6em .5em .6em;
-        &:hover { border-top-color:@link-hover-color; }
-    }
-    &.clpse {
-        border-left-color:@link-color;
-        border-right:none;
-        margin:.3em .9em .3em .7em;
-        &:hover { border-left-color:@link-hover-color; }
+        cursor: pointer;
+        border: .4em solid transparent; //reset
+        border-top-color: @link-color;
+        border-bottom: none;
+        margin: .5em .6em .5em .6em;
+        &:hover { border-top-color: @link-hover-color; }
     }
 
 }
+.xpand, .clpse { overflow:hidden; }
 
 
 // CHECKME: Make sure to print collapsed items as if they were not collapsed 
+//move to print.less
 @media print {
     div.clpse {
         display:block;
@@ -64,7 +58,6 @@ DOM structure:
     }
 }
 
-.xpand, .clpse { overflow:hidden; }
 
 /*
 TODO: Experimental - css3 animation iso mootools tween.
@@ -132,8 +125,8 @@ div[class^=collapsebox] {
 
     //coloured collapseboxes get white bullets    
     &:not(.panel-default) .bullet {
-        &.xpand, &.xpand:hover { border-top-color:@white; }
-        &.clpse, &.clpse:hover { border-left-color:@white; }
+        &.xpand, &.xpand:hover { border-top-color: @white; }
+        &.clpse, &.clpse:hover { border-left-color: @white; }
     }
 }
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.Content.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.Content.less?rev=1569540&r1=1569539&r2=1569540&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.Content.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.Content.less Tue Feb 18 22:07:39
2014
@@ -34,13 +34,13 @@ DOM Structure:
 }
 .sidebar {
     float:left;
-    margin-left:-22%;
-    width:22%;
+    margin-left:-20%;
+    width:20%;
     overflow-x:hidden;
 }
  
 .content.active {
-    .page { width:78%; }
+    .page { width:80%; }
     .sidebar { margin-left:0; }
 }
 

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.View.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.View.less?rev=1569540&r1=1569539&r2=1569540&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.View.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/Template.View.less Tue Feb 18 22:07:39
2014
@@ -61,6 +61,10 @@ DOM structure:
 (end)
 */
 
+.container-fluid {
+	margin:0 1em;
+}
+
 .header, .footer {
 	position: relative;
     font-family: @font-family-header;
@@ -68,8 +72,6 @@ DOM structure:
     letter-spacing: 1px;
     color: @white;
     
-    
- 
     height:8em;
     padding:1em;
   

Modified: jspwiki/trunk/jspwiki-war/src/main/styles/haddock/grid.less
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/styles/haddock/grid.less?rev=1569540&r1=1569539&r2=1569540&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/styles/haddock/grid.less (original)
+++ jspwiki/trunk/jspwiki-war/src/main/styles/haddock/grid.less Tue Feb 18 22:07:39 2014
@@ -19,3 +19,6 @@
 .row {
   .clearfix();
 }
+.col-50 {
+  width:50%; float:left;
+}
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp?rev=1569540&r1=1569539&r2=1569540&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/haddock/PreferencesTab.jsp Tue Feb
18 22:07:39 2014
@@ -138,7 +138,7 @@
   <div class="form-group">
   <label class="control-label form-col-20" for="prefOrientation"><fmt:message key="prefs.user.orientation"/></label>
   
-  <select class="" id="prefOrientation" name="prefOrientation" onclick="Wiki.changeOrientation();"
 data-pref="Orientation">
+  <select class="" id="prefOrientation" name="prefOrientation" data-pref="Orientation">
       <option value='fav-left' <c:if test='${"fav-left" == prefs.Orientation}'>selected="selected"</c:if>
><fmt:message key="prefs.user.orientation.left"/></option>
       <option value='fav-right' <c:if test='${"fav-right" == prefs.Orientation}'>selected="selected"</c:if>
><fmt:message key="prefs.user.orientation.right"/></option>
   </select>

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=1569540&r1=1569539&r2=1569540&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 Tue Feb 18
22:07:39 2014
@@ -45,7 +45,7 @@
 
 <body class="context-<wiki:Variable var='requestcontext' />">
 
-<div class="container ${prefs.Orientation}">
+<div class="container-fluid ${prefs.Orientation}">
  
   <wiki:Include page="Header.jsp" />
   <wiki:Include page="Nav.jsp" />



Mime
View raw message