portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r1666582 - in /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp: css/bootstrap/dist/css/ decorations/layout/bootstrap-blue/ decorations/layout/bootstrap-blue/css/ decorations/layout/bootstrap-green/ decorations/layout/b...
Date Fri, 13 Mar 2015 21:09:26 GMT
Author: taylor
Date: Fri Mar 13 21:09:25 2015
New Revision: 1666582

URL: http://svn.apache.org/r1666582
Log:
JS2-1318: added second responsive menu for Pages menu. Cleanup of responsive decorators

Removed:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/css/styles-blue.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/css/styles-green.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/css/styles-red.css
Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/css/bootstrap/dist/css/bootstrap-green.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/css/styles.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/footer.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/header.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/css/styles.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/footer.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/header.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/css/styles.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/footer.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/header.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/css/styles.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/footer.vm
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/header.vm

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/css/bootstrap/dist/css/bootstrap-green.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/css/bootstrap/dist/css/bootstrap-green.css?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/css/bootstrap/dist/css/bootstrap-green.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/css/bootstrap/dist/css/bootstrap-green.css Fri Mar 13 21:09:25 2015
@@ -99,7 +99,6 @@ figure {
 }
 hr {
   -moz-box-sizing: content-box;
-  -webkit-box-sizing: content-box;
           box-sizing: content-box;
   height: 0;
 }
@@ -151,8 +150,6 @@ input {
 input[type="checkbox"],
 input[type="radio"] {
   -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
   padding: 0;
 }
 input[type="number"]::-webkit-inner-spin-button,
@@ -199,7 +196,6 @@ th {
   *:after {
     background: transparent !important;
     color: #000 !important;
-    -webkit-box-shadow: none !important;
             box-shadow: none !important;
     text-shadow: none !important;
   }
@@ -1110,7 +1106,9 @@ img {
 }
 .img-responsive,
 .thumbnail > img,
-.thumbnail a > img {
+.thumbnail a > img,
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
   display: block;
   max-width: 100%;
   height: auto;
@@ -1524,14 +1522,12 @@ kbd {
   color: #ffffff;
   background-color: #333333;
   border-radius: 3px;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
           box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
 kbd kbd {
   padding: 0;
   font-size: 100%;
   font-weight: bold;
-  -webkit-box-shadow: none;
           box-shadow: none;
 }
 pre {
@@ -2539,7 +2535,7 @@ output {
   border-radius: 4px;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
   -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
   transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 }
@@ -2954,7 +2950,7 @@ select[multiple].form-group-lg .form-con
 }
 @media (min-width: 768px) {
   .form-horizontal .form-group-lg .control-label {
-    padding-top: 14.333333px;
+    padding-top: 14.3px;
   }
 }
 @media (min-width: 768px) {
@@ -2968,7 +2964,6 @@ select[multiple].form-group-lg .form-con
   font-weight: normal;
   text-align: center;
   vertical-align: middle;
-  -ms-touch-action: manipulation;
       touch-action: manipulation;
   cursor: pointer;
   background-image: none;
@@ -3352,6 +3347,179 @@ input[type="reset"].btn-block,
 input[type="button"].btn-block {
   width: 100%;
 }
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity 0.15s linear;
+  -o-transition: opacity 0.15s linear;
+  transition: opacity 0.15s linear;
+}
+.fade.in {
+  opacity: 1;
+}
+.collapse {
+  display: none;
+  visibility: hidden;
+}
+.collapse.in {
+  display: block;
+  visibility: visible;
+}
+tr.collapse.in {
+  display: table-row;
+}
+tbody.collapse.in {
+  display: table-row-group;
+}
+.collapsing {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition-property: height, visibility;
+  transition-property: height, visibility;
+  -webkit-transition-duration: 0.35s;
+  transition-duration: 0.35s;
+  -webkit-transition-timing-function: ease;
+  transition-timing-function: ease;
+}
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  margin-left: 2px;
+  vertical-align: middle;
+  border-top: 4px solid;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+}
+.dropdown {
+  position: relative;
+}
+.dropdown-toggle:focus {
+  outline: 0;
+}
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  list-style: none;
+  font-size: 14px;
+  text-align: left;
+  background-color: #16193b;
+  border: 1px solid #cccccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-radius: 4px;
+  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  background-clip: padding-box;
+}
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+.dropdown-menu .divider {
+  height: 1px;
+  margin: 9px 0;
+  overflow: hidden;
+  background-color: #e5e5e5;
+}
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 1.42857143;
+  color: #A6C0ED;
+  white-space: nowrap;
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
+  text-decoration: none;
+  color: #ffffff;
+  background-color: #35478c;
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  outline: 0;
+  background-color: #35478c;
+}
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #777777;
+}
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  background-color: transparent;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  cursor: not-allowed;
+}
+.open > .dropdown-menu {
+  display: block;
+}
+.open > a {
+  outline: 0;
+}
+.dropdown-menu-right {
+  left: auto;
+  right: 0;
+}
+.dropdown-menu-left {
+  left: 0;
+  right: auto;
+}
+.dropdown-header {
+  display: block;
+  padding: 3px 20px;
+  font-size: 12px;
+  line-height: 1.42857143;
+  color: #777777;
+  white-space: nowrap;
+}
+.dropdown-backdrop {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  z-index: 990;
+}
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px solid;
+  content: "";
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 1px;
+}
+@media (min-width: 768px) {
+  .navbar-right .dropdown-menu {
+    left: auto;
+    right: 0;
+  }
+  .navbar-right .dropdown-menu-left {
+    left: 0;
+    right: auto;
+  }
+}
 .btn-group,
 .btn-group-vertical {
   position: relative;

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/css/styles.css?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/css/styles.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/css/styles.css Fri Mar 13 21:09:25 2015
@@ -21,13 +21,13 @@ limitations under the License.
 * { margin:0; padding:0; }
 
 body, div, span, a, form, li, ul, ol, input, select, textarea, button, pre, blockquote, label, h1, h2, h3, h4, td, tr, th, tbody, table, p, iframe, img  {
- padding:0px;margin:0px;
- white-space:normal;
-/* font-weight:normal;
- font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;
- voice-family: "\"}\"";
- voice-family: inherit;
- font-size:8pt;*/
+    padding:0px;margin:0px;
+    white-space:normal;
+    /* font-weight:normal;
+     font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;
+     voice-family: "\"}\"";
+     voice-family: inherit;
+     font-size:8pt;*/
 }
 
 body {
@@ -35,27 +35,27 @@ body {
 }
 
 textarea, button, select, form {
- padding:1px;
+    padding:1px;
 }
 
 p {
- margin-top:4px;
- margin-bottom:4px;
+    margin-top:4px;
+    margin-bottom:4px;
 }
 
 h2 {
- margin-bottom:6px;
- color:#12293f;
- font-size:9pt;
- font-weight:bold;
+    margin-bottom:6px;
+    color:#12293f;
+    font-size:9pt;
+    font-weight:bold;
 }
 
 h3 {
- margin-bottom:4px;
- text-decoration:underline;
+    margin-bottom:4px;
+    text-decoration:underline;
 }
 
-/** 
+/**
   This white-space setting is VERY important as it keeps content from "spilling"
   outside of portlets.
   */
@@ -63,12 +63,12 @@ h3 {
 td,
 th
 {
-  white-space: normal;
+    white-space: normal;
 }
 
 th
 {
-  font-size: 11px;
+    font-size: 11px;
 }
 
 
@@ -130,9 +130,9 @@ background-position: 0px -30px
 */
 
 /* Tab hyperlink styling */
-.layout-jetspeed .LTabLow A:link, 
+.layout-jetspeed .LTabLow A:link,
 .layout-jetspeed .LTabLow A:visited,
-.layout-jetspeed .LTabLow A:hover, 
+.layout-jetspeed .LTabLow A:hover,
 .layout-jetspeed .LTabLow A:active
 {
     text-decoration: none;
@@ -148,7 +148,7 @@ background-position: 0px -30px
 
 .layout-jetspeed .LTabLow
 {
-    height:25px;    
+    height:25px;
     padding-left: 0px;
     padding-right: 0px;
 }
@@ -169,11 +169,11 @@ background-position: 0px -30px
 
 .layout-jetspeed .LTab
 {
-    height:30px;    
+    height:30px;
     padding-left: 0px;
     padding-right: 0px;
 }
- 
+
 .layout-jetspeed .LTabRight
 {
     width:10px;
@@ -182,9 +182,9 @@ background-position: 0px -30px
 }
 
 .layout-jetspeed .menu {
-/*    background:url(../images/blue_gradient.gif) #05549c;
-    padding:1px;
-    border-top:1px solid #033563;*/
+    /*    background:url(../images/blue_gradient.gif) #05549c;
+        padding:1px;
+        border-top:1px solid #033563;*/
     background: lightgrey;
 }
 
@@ -196,29 +196,29 @@ background-position: 0px -30px
 }
 
 .layout-jetspeed .menu a:hover {
-   color:black;
-   background-color: #EEE;
+    color:black;
+    background-color: #EEE;
 }
 
 .layout-jetspeed .menu a.current {
     color: black;
     cursor: default;
-    background: lightgrey !important;
+    background: #89E3FF !important;
 }
 
 .layout-jetspeed .tabs {
-   list-style-type:none;
-   list-style-position:inside;
-   display:table;
+    list-style-type:none;
+    list-style-position:inside;
+    display:table;
 }
 
 .layout-jetspeed .tabs li {
-   float:left;
-   display:inline;
-   border-collapse:collapse;
-   margin-right:10px;
-   padding: 3px;
-   color:#fff;
+    float:left;
+    display:inline;
+    border-collapse:collapse;
+    margin-right:10px;
+    padding: 3px;
+    color:#fff;
 }
 
 .layout-jetspeed #banner h1 {
@@ -257,7 +257,7 @@ background-position: 0px -30px
     margin: 0;
 }
 
-.layout-jetspeed #leftcol 
+.layout-jetspeed #leftcol
 {
     width: 17%;
     voice-family: "\"}\"";
@@ -327,7 +327,7 @@ background-position: 0px -30px
 
 #portal-page-actions A img
 {
-   display: inline;   
+    display: inline;
 }
 
 #portal-page-actions
@@ -341,49 +341,49 @@ background-position: 0px -30px
 
 .FolderList
 {
-   display: inline;
+    display: inline;
 }
 
 .layout-jetspeed .layout-edit-bar
 {
-  width: 100%;
-  padding-top: 5px;
-  font-size: 8pt;
-  color: blue;
-  overflow:hidden;
-  clip:auto;
+    width: 100%;
+    padding-top: 5px;
+    font-size: 8pt;
+    color: blue;
+    overflow:hidden;
+    clip:auto;
 }
 
-.layout-jetspeed .layout-edit-bar label, 
-.layout-jetspeed .layout-edit-bar input, 
-.layout-jetspeed .layout-edit-bar select 
+.layout-jetspeed .layout-edit-bar label,
+.layout-jetspeed .layout-edit-bar input,
+.layout-jetspeed .layout-edit-bar select
 {
-  font-size: 11px;
-  color: #000;
+    font-size: 11px;
+    color: #000;
 }
 
 .layout-jetspeed .layout-edit-bar input
 {
-  font-size: 8pt;
+    font-size: 8pt;
 }
 
 .layout-jetspeed .layout-edit-bar-left
 {
-  display:inline;
-  float:left;
+    display:inline;
+    float:left;
 }
 
 .layout-jetspeed .layout-edit-bar-right
 {
-  display:inline;
-  float:right;
-  padding-right: 5px;
+    display:inline;
+    float:right;
+    padding-right: 5px;
 }
 
 .layout-jetspeed .portlet-edit-bar select
 {
-  font-size: 8pt;
-  color: blue;
+    font-size: 8pt;
+    color: blue;
 }
 
 
@@ -393,7 +393,7 @@ background-position: 0px -30px
 .layout-jetspeed
 {
   font-family: Verdana,sans-serif;
-  font-size: 8pt; 
+  font-size: 8pt;
 }
 
 .layout-jetspeed td{
@@ -404,67 +404,67 @@ background-position: 0px -30px
 */
 .layout-jetspeed .header {
     width:100%;
-    background:grey;
-    border-bottom:4px solid #eef0f0;
+    background:#A4BEEA;
+    border-bottom:4px solid #9EC3E2;
     margin:0px;
 }
 
 .layout-jetspeed .logo {
-text-indent: -9999px;   
-background: url("../images/jetspeed-logo.gif") no-repeat;
-background-position: 8px 8px;
-height:35px;
-padding:3px;
+    text-indent: -9999px;
+    background: url("../images/jetspeed-logo.gif") no-repeat;
+    background-position: 8px 8px;
+    height:35px;
+    padding:3px;
 }
 
 /* Logout */
 /* ================================================ */
 .layout-jetspeed .layout-jetspeed-logout {
-position: absolute; 
-right: 5px; top: 5px; 
-z-index: 10;  
-color: #fff;
-padding:2px;
-text-decoration:none;
-font-size:8pt;
+    position: absolute;
+    right: 5px; top: 5px;
+    z-index: 10;
+    color: #fff;
+    padding:2px;
+    text-decoration:none;
+    font-size:8pt;
 }
 
 .layout-jetspeed .layout-search {
-position: absolute; 
-right: 22px; top: 18px; 
-color: #000;
-padding:2px;
-text-decoration:none;
+    position: absolute;
+    right: 22px; top: 18px;
+    color: #000;
+    padding:2px;
+    text-decoration:none;
 }
 
 .layout-jetspeed .layout-search2 {
-position: absolute; 
-right: 3px; top: 21px; 
+    position: absolute;
+    right: 3px; top: 21px;
 }
 
 .layout-jetspeed .layout-horizontal-menu {
-position:absolute;
-display:none;
-left:300px;
-top:10px;
+    position:absolute;
+    display:none;
+    left:300px;
+    top:10px;
 }
 
 .layout-jetspeed .layout-statusarea {
-position: absolute; 
-right: 2px; top: 12px; 
-color: #fff;
-padding:2px;
-text-decoration:none;
-font-size:8pt;
+    position: absolute;
+    right: 2px; top: 12px;
+    color: #fff;
+    padding:2px;
+    text-decoration:none;
+    font-size:8pt;
 }
 .layyout-jetspeed .layout-statusarea A:visited,
 .layout-jetspeed .layout-statusarea A {
-color: #fff;
-font-size:8pt;
+    color: #fff;
+    font-size:8pt;
 }
 
 .layout-jetspeed .layout-jetspeed-logout:hover{
-text-decoration: underline;
+    text-decoration: underline;
 }
 
 .layout-jetspeed .tooltext { font-size: 8pt; }
@@ -488,36 +488,36 @@ text-decoration: underline;
 
 .layout-jetspeed-logout{float: right; display: block;}
 
-.layout-jetspeed .portal-page-actions{ 
-margin-bottom: 0px; 
-float: right;
+.layout-jetspeed .portal-page-actions{
+    margin-bottom: 0px;
+    float: right;
 
 }
 .layout-jetspeed .portal-page-actions li{display: block; float: left; margin-left: 10px;}
 .layout-jetspeed .portal-page-actions a{
-background-image: none;
-color: white;
-text-decoration: underline;
+    background-image: none;
+    color: white;
+    text-decoration: underline;
 }
 .layout-jetspeed .portal-page-actions a span{}
 
 .layout-jetspeed .layout-edit-bar {
-background: #f2f2f2 url("../images/layout-bar-shade.png") repeat-x left bottom;
-padding-bottom: 15px;
-width: 100%;
-clear:both;
+    background: #f2f2f2 url("../images/layout-bar-shade.png") repeat-x left bottom;
+    padding-bottom: 15px;
+    width: 100%;
+    clear:both;
 }
 .layout-jetspeed .layout-edit-bar tr td{padding: 4px; vertical-align: top}
 .layout-jetspeed .layout-portlet-move{float: left;}
 .layout-jetspeed .layout-portlet-move li{float: left; display: block}
 .layout-jetspeed .layout-portlet-move a{
-display: block;
-float: left;
-width: 16px; 
-height: 16px;
-background-repeat: no-repeat;
-background-position: 0px 0px;
-margin-left: 2px;
+    display: block;
+    float: left;
+    width: 16px;
+    height: 16px;
+    background-repeat: no-repeat;
+    background-position: 0px 0px;
+    margin-left: 2px;
 }
 .layout-jetspeed .layout-portlet-move a:hover{background-position: 0px -16px}
 .layout-jetspeed .layout-portlet-move a span{display: none}
@@ -540,47 +540,47 @@ margin-left: 2px;
 
 .layout-jetspeed .layout-jetspeed-addportlet{padding: 25px; background: #f2f2f2; text-align: center;}
 .layout-jetspeed .layout-jetspeed-addportlet a{
-background: url("../images/addportlet.png") no-repeat; 
-width: 146px; height: 30px;
-padding: 10px 48px 13px 35px;
-background-position: 0px 0px;
-color: white;
+    background: url("../images/addportlet.png") no-repeat;
+    width: 146px; height: 30px;
+    padding: 10px 48px 13px 35px;
+    background-position: 0px 0px;
+    color: white;
 }
 .layout-jetspeed .layout-jetspeed-addportlet a:hover{
-background-position: 0px -39px;
+    background-position: 0px -39px;
 }
 
 /* Layout configuration inside a portlet */
 
 .layout-jetspeed .portal-layout-cell .portal-layout-cell .layout-edit-bar{
-padding: 0px; 
-background: #f2f2f2 url("../images/portletheadingback.png") repeat-x top left;
-padding-top: 24px;
-padding-bottom: 5px;
-margin-bottom: 10px;
+    padding: 0px;
+    background: #f2f2f2 url("../images/portletheadingback.png") repeat-x top left;
+    padding-top: 24px;
+    padding-bottom: 5px;
+    margin-bottom: 10px;
 }
 
 .layout-jetspeed .portal-layout-cell .layout-edit-bar b{padding-right: 0px}
 .layout-jetspeed .portal-layout-cell .layout-edit-bar .layout-title{
-padding: 4px;
+    padding: 4px;
 }
 
 .layout-jetspeed .portlet-edit-bar{
-background: url("../images/portlet-layout-bar-back.gif") no-repeat top left; 
-height: 18px;
-margin: 10px;
-margin-bottom: -5px;
-padding: 1px;
+    background: url("../images/portlet-layout-bar-back.gif") no-repeat top left;
+    height: 18px;
+    margin: 10px;
+    margin-bottom: -5px;
+    padding: 1px;
 }
 .layout-jetspeed .portlet-edit-bar a{display: block ; float: left; margin-top: 2px;}
 .layout-jetspeed .portlet-edit-bar select{width: 120px;}
 .layout-jetspeed .portlet-edit-bar label{
-float: left; 
-color: white; 
-display: block; 
-margin-top: 2px; 
-padding: 2px;
-font-weight: bold;
+    float: left;
+    color: white;
+    display: block;
+    margin-top: 2px;
+    padding: 2px;
+    font-weight: bold;
 }
 
 .layout-jetspeed .portlet-edit-bar select{background: transparent; border: 1px solid #666666; float: left; color: white; padding: 0px; height: 18px;}
@@ -602,3 +602,38 @@ font-weight: bold;
     margin-left: 0px;
     clear: both;
 }
+
+/**/
+
+.float-icon {
+    position: fixed;
+    right: 0px;
+    bottom: 1em;
+}
+
+.float-icon button {
+    float: none;
+    background: #aaa;
+    color: black;
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+    border-color: grey;
+    margin: 0;
+    padding: 7px 5px;
+    cursor: pointer;
+    cursor: hand;
+}
+
+.float-icon button .icon-bar {
+    background: black;
+    width: 18px;
+}
+
+#float-menu {
+    display: block !important;
+    position: fixed;
+    bottom: 4em;
+    right: 0em;
+    background: #eee;
+    z-index: 100;
+}

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/footer.vm?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/footer.vm Fri Mar 13 21:09:25 2015
@@ -32,6 +32,25 @@ limitations under the License.
 
       </div>
 #end
+
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+#if(!$navigationsStandardMenu.empty)
+<div class="float-icon visible-xs-inline" target="#float-menu">
+    <button type="button" class="navbar-toggle">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+    </button>
+</div>
+
+<div class="col-xs-12 hidden" id="float-menu">
+    <div id="navcolumn">
+        #includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+    </div>
+</div>
+#end
+
 #if ($jetspeed.isAjaxCustomizationEnabled())
 <script src="#BaseHref()jetui/engine/portal.js"></script>
 <div id="jsPortletTemplate" class="portal-layout-cell yui-dd-draggable yui-dd-drop" style="display: none">
@@ -53,6 +72,11 @@ limitations under the License.
     <p>
       <img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
     </p>
+    <script type="text/javascript">
+        $(document.body).on("click", ".float-icon", function() {
+            $($(this).attr("target")).toggleClass("hidden");
+        });
+    </script>
 </footer>
 </body>
 </html>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/header.vm?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-blue/header.vm Fri Mar 13 21:09:25 2015
@@ -62,15 +62,14 @@ var JETUI_YUI = {
 </script>
 <link rel="stylesheet" type="text/css" href="#BaseHref()jetui/css/portal.css"/>
 #end
-
-#includeHeaderResource()
-
 <meta http-equiv="Content-type" content="#ContentType()" />
 <title>#PageTitle()</title>
 <link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
-#includeJavaScriptForHead()
 <script type="text/javascript" src="#BaseHref()javascript/jquery/jquery-2.1.3.min.js"></script>
+<script type="text/javascript" src="#BaseHref()css/bootstrap/dist/js/bootstrap.min.js"></script>
+#includeHeaderResource()
 #IncludeStylesheets()
+#includeJavaScriptForHead()
 <link rel="stylesheet" type="text/css" href="#BaseHref()css/bootstrap/dist/css/bootstrap-blue.css"/>
 <link rel="stylesheet" type="text/css" href="#BaseHref()decorations/layout/bootstrap-blue/css/styles-new-blue.css"/>
 </head>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/css/styles.css?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/css/styles.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/css/styles.css Fri Mar 13 21:09:25 2015
@@ -21,13 +21,13 @@ limitations under the License.
 * { margin:0; padding:0; }
 
 body, div, span, a, form, li, ul, ol, input, select, textarea, button, pre, blockquote, label, h1, h2, h3, h4, td, tr, th, tbody, table, p, iframe, img  {
- padding:0px;margin:0px;
- white-space:normal;
-/* font-weight:normal;
- font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;
- voice-family: "\"}\"";
- voice-family: inherit;
- font-size:8pt;*/
+    padding:0px;margin:0px;
+    white-space:normal;
+    /* font-weight:normal;
+     font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;
+     voice-family: "\"}\"";
+     voice-family: inherit;
+     font-size:8pt;*/
 }
 
 body {
@@ -35,27 +35,27 @@ body {
 }
 
 textarea, button, select, form {
- padding:1px;
+    padding:1px;
 }
 
 p {
- margin-top:4px;
- margin-bottom:4px;
+    margin-top:4px;
+    margin-bottom:4px;
 }
 
 h2 {
- margin-bottom:6px;
- color:#12293f;
- font-size:9pt;
- font-weight:bold;
+    margin-bottom:6px;
+    color:#12293f;
+    font-size:9pt;
+    font-weight:bold;
 }
 
 h3 {
- margin-bottom:4px;
- text-decoration:underline;
+    margin-bottom:4px;
+    text-decoration:underline;
 }
 
-/** 
+/**
   This white-space setting is VERY important as it keeps content from "spilling"
   outside of portlets.
   */
@@ -63,12 +63,12 @@ h3 {
 td,
 th
 {
-  white-space: normal;
+    white-space: normal;
 }
 
 th
 {
-  font-size: 11px;
+    font-size: 11px;
 }
 
 
@@ -130,9 +130,9 @@ background-position: 0px -30px
 */
 
 /* Tab hyperlink styling */
-.layout-jetspeed .LTabLow A:link, 
+.layout-jetspeed .LTabLow A:link,
 .layout-jetspeed .LTabLow A:visited,
-.layout-jetspeed .LTabLow A:hover, 
+.layout-jetspeed .LTabLow A:hover,
 .layout-jetspeed .LTabLow A:active
 {
     text-decoration: none;
@@ -148,7 +148,7 @@ background-position: 0px -30px
 
 .layout-jetspeed .LTabLow
 {
-    height:25px;    
+    height:25px;
     padding-left: 0px;
     padding-right: 0px;
 }
@@ -169,11 +169,11 @@ background-position: 0px -30px
 
 .layout-jetspeed .LTab
 {
-    height:30px;    
+    height:30px;
     padding-left: 0px;
     padding-right: 0px;
 }
- 
+
 .layout-jetspeed .LTabRight
 {
     width:10px;
@@ -182,9 +182,9 @@ background-position: 0px -30px
 }
 
 .layout-jetspeed .menu {
-/*    background:url(../images/blue_gradient.gif) #05549c;
-    padding:1px;
-    border-top:1px solid #033563;*/
+    /*    background:url(../images/blue_gradient.gif) #05549c;
+        padding:1px;
+        border-top:1px solid #033563;*/
     background: lightgrey;
 }
 
@@ -196,29 +196,29 @@ background-position: 0px -30px
 }
 
 .layout-jetspeed .menu a:hover {
-   color:black;
-   background-color: #EEE;
+    color:black;
+    background-color: #EEE;
 }
 
 .layout-jetspeed .menu a.current {
     color: black;
     cursor: default;
-    background: lightgrey !important;
+    background: #C4ED93 !important;
 }
 
 .layout-jetspeed .tabs {
-   list-style-type:none;
-   list-style-position:inside;
-   display:table;
+    list-style-type:none;
+    list-style-position:inside;
+    display:table;
 }
 
 .layout-jetspeed .tabs li {
-   float:left;
-   display:inline;
-   border-collapse:collapse;
-   margin-right:10px;
-   padding: 3px;
-   color:#fff;
+    float:left;
+    display:inline;
+    border-collapse:collapse;
+    margin-right:10px;
+    padding: 3px;
+    color:#fff;
 }
 
 .layout-jetspeed #banner h1 {
@@ -257,7 +257,7 @@ background-position: 0px -30px
     margin: 0;
 }
 
-.layout-jetspeed #leftcol 
+.layout-jetspeed #leftcol
 {
     width: 17%;
     voice-family: "\"}\"";
@@ -327,7 +327,7 @@ background-position: 0px -30px
 
 #portal-page-actions A img
 {
-   display: inline;   
+    display: inline;
 }
 
 #portal-page-actions
@@ -341,49 +341,49 @@ background-position: 0px -30px
 
 .FolderList
 {
-   display: inline;
+    display: inline;
 }
 
 .layout-jetspeed .layout-edit-bar
 {
-  width: 100%;
-  padding-top: 5px;
-  font-size: 8pt;
-  color: blue;
-  overflow:hidden;
-  clip:auto;
+    width: 100%;
+    padding-top: 5px;
+    font-size: 8pt;
+    color: blue;
+    overflow:hidden;
+    clip:auto;
 }
 
-.layout-jetspeed .layout-edit-bar label, 
-.layout-jetspeed .layout-edit-bar input, 
-.layout-jetspeed .layout-edit-bar select 
+.layout-jetspeed .layout-edit-bar label,
+.layout-jetspeed .layout-edit-bar input,
+.layout-jetspeed .layout-edit-bar select
 {
-  font-size: 11px;
-  color: #000;
+    font-size: 11px;
+    color: #000;
 }
 
 .layout-jetspeed .layout-edit-bar input
 {
-  font-size: 8pt;
+    font-size: 8pt;
 }
 
 .layout-jetspeed .layout-edit-bar-left
 {
-  display:inline;
-  float:left;
+    display:inline;
+    float:left;
 }
 
 .layout-jetspeed .layout-edit-bar-right
 {
-  display:inline;
-  float:right;
-  padding-right: 5px;
+    display:inline;
+    float:right;
+    padding-right: 5px;
 }
 
 .layout-jetspeed .portlet-edit-bar select
 {
-  font-size: 8pt;
-  color: blue;
+    font-size: 8pt;
+    color: blue;
 }
 
 
@@ -393,7 +393,7 @@ background-position: 0px -30px
 .layout-jetspeed
 {
   font-family: Verdana,sans-serif;
-  font-size: 8pt; 
+  font-size: 8pt;
 }
 
 .layout-jetspeed td{
@@ -404,67 +404,67 @@ background-position: 0px -30px
 */
 .layout-jetspeed .header {
     width:100%;
-    background:grey;
-    border-bottom:4px solid #eef0f0;
+    background:#608D4E;
+    border-bottom:4px solid #CCEABE;
     margin:0px;
 }
 
 .layout-jetspeed .logo {
-text-indent: -9999px;   
-background: url("../images/jetspeed-logo.gif") no-repeat;
-background-position: 8px 8px;
-height:35px;
-padding:3px;
+    text-indent: -9999px;
+    background: url("../images/jetspeed-logo.gif") no-repeat;
+    background-position: 8px 8px;
+    height:35px;
+    padding:3px;
 }
 
 /* Logout */
 /* ================================================ */
 .layout-jetspeed .layout-jetspeed-logout {
-position: absolute; 
-right: 5px; top: 5px; 
-z-index: 10;  
-color: #fff;
-padding:2px;
-text-decoration:none;
-font-size:8pt;
+    position: absolute;
+    right: 5px; top: 5px;
+    z-index: 10;
+    color: #fff;
+    padding:2px;
+    text-decoration:none;
+    font-size:8pt;
 }
 
 .layout-jetspeed .layout-search {
-position: absolute; 
-right: 22px; top: 18px; 
-color: #000;
-padding:2px;
-text-decoration:none;
+    position: absolute;
+    right: 22px; top: 18px;
+    color: #000;
+    padding:2px;
+    text-decoration:none;
 }
 
 .layout-jetspeed .layout-search2 {
-position: absolute; 
-right: 3px; top: 21px; 
+    position: absolute;
+    right: 3px; top: 21px;
 }
 
 .layout-jetspeed .layout-horizontal-menu {
-position:absolute;
-display:none;
-left:300px;
-top:10px;
+    position:absolute;
+    display:none;
+    left:300px;
+    top:10px;
 }
 
 .layout-jetspeed .layout-statusarea {
-position: absolute; 
-right: 2px; top: 12px; 
-color: #fff;
-padding:2px;
-text-decoration:none;
-font-size:8pt;
+    position: absolute;
+    right: 2px; top: 12px;
+    color: #fff;
+    padding:2px;
+    text-decoration:none;
+    font-size:8pt;
 }
 .layyout-jetspeed .layout-statusarea A:visited,
 .layout-jetspeed .layout-statusarea A {
-color: #fff;
-font-size:8pt;
+    color: #fff;
+    font-size:8pt;
 }
 
 .layout-jetspeed .layout-jetspeed-logout:hover{
-text-decoration: underline;
+    text-decoration: underline;
 }
 
 .layout-jetspeed .tooltext { font-size: 8pt; }
@@ -488,36 +488,36 @@ text-decoration: underline;
 
 .layout-jetspeed-logout{float: right; display: block;}
 
-.layout-jetspeed .portal-page-actions{ 
-margin-bottom: 0px; 
-float: right;
+.layout-jetspeed .portal-page-actions{
+    margin-bottom: 0px;
+    float: right;
 
 }
 .layout-jetspeed .portal-page-actions li{display: block; float: left; margin-left: 10px;}
 .layout-jetspeed .portal-page-actions a{
-background-image: none;
-color: white;
-text-decoration: underline;
+    background-image: none;
+    color: white;
+    text-decoration: underline;
 }
 .layout-jetspeed .portal-page-actions a span{}
 
 .layout-jetspeed .layout-edit-bar {
-background: #f2f2f2 url("../images/layout-bar-shade.png") repeat-x left bottom;
-padding-bottom: 15px;
-width: 100%;
-clear:both;
+    background: #f2f2f2 url("../images/layout-bar-shade.png") repeat-x left bottom;
+    padding-bottom: 15px;
+    width: 100%;
+    clear:both;
 }
 .layout-jetspeed .layout-edit-bar tr td{padding: 4px; vertical-align: top}
 .layout-jetspeed .layout-portlet-move{float: left;}
 .layout-jetspeed .layout-portlet-move li{float: left; display: block}
 .layout-jetspeed .layout-portlet-move a{
-display: block;
-float: left;
-width: 16px; 
-height: 16px;
-background-repeat: no-repeat;
-background-position: 0px 0px;
-margin-left: 2px;
+    display: block;
+    float: left;
+    width: 16px;
+    height: 16px;
+    background-repeat: no-repeat;
+    background-position: 0px 0px;
+    margin-left: 2px;
 }
 .layout-jetspeed .layout-portlet-move a:hover{background-position: 0px -16px}
 .layout-jetspeed .layout-portlet-move a span{display: none}
@@ -540,47 +540,47 @@ margin-left: 2px;
 
 .layout-jetspeed .layout-jetspeed-addportlet{padding: 25px; background: #f2f2f2; text-align: center;}
 .layout-jetspeed .layout-jetspeed-addportlet a{
-background: url("../images/addportlet.png") no-repeat; 
-width: 146px; height: 30px;
-padding: 10px 48px 13px 35px;
-background-position: 0px 0px;
-color: white;
+    background: url("../images/addportlet.png") no-repeat;
+    width: 146px; height: 30px;
+    padding: 10px 48px 13px 35px;
+    background-position: 0px 0px;
+    color: white;
 }
 .layout-jetspeed .layout-jetspeed-addportlet a:hover{
-background-position: 0px -39px;
+    background-position: 0px -39px;
 }
 
 /* Layout configuration inside a portlet */
 
 .layout-jetspeed .portal-layout-cell .portal-layout-cell .layout-edit-bar{
-padding: 0px; 
-background: #f2f2f2 url("../images/portletheadingback.png") repeat-x top left;
-padding-top: 24px;
-padding-bottom: 5px;
-margin-bottom: 10px;
+    padding: 0px;
+    background: #f2f2f2 url("../images/portletheadingback.png") repeat-x top left;
+    padding-top: 24px;
+    padding-bottom: 5px;
+    margin-bottom: 10px;
 }
 
 .layout-jetspeed .portal-layout-cell .layout-edit-bar b{padding-right: 0px}
 .layout-jetspeed .portal-layout-cell .layout-edit-bar .layout-title{
-padding: 4px;
+    padding: 4px;
 }
 
 .layout-jetspeed .portlet-edit-bar{
-background: url("../images/portlet-layout-bar-back.gif") no-repeat top left; 
-height: 18px;
-margin: 10px;
-margin-bottom: -5px;
-padding: 1px;
+    background: url("../images/portlet-layout-bar-back.gif") no-repeat top left;
+    height: 18px;
+    margin: 10px;
+    margin-bottom: -5px;
+    padding: 1px;
 }
 .layout-jetspeed .portlet-edit-bar a{display: block ; float: left; margin-top: 2px;}
 .layout-jetspeed .portlet-edit-bar select{width: 120px;}
 .layout-jetspeed .portlet-edit-bar label{
-float: left; 
-color: white; 
-display: block; 
-margin-top: 2px; 
-padding: 2px;
-font-weight: bold;
+    float: left;
+    color: white;
+    display: block;
+    margin-top: 2px;
+    padding: 2px;
+    font-weight: bold;
 }
 
 .layout-jetspeed .portlet-edit-bar select{background: transparent; border: 1px solid #666666; float: left; color: white; padding: 0px; height: 18px;}
@@ -602,3 +602,40 @@ font-weight: bold;
     margin-left: 0px;
     clear: both;
 }
+
+/**/
+
+.float-icon {
+    position: fixed;
+    right: 0px;
+    bottom: 1em;
+}
+
+.float-icon button {
+    float: none;
+    background: #aaa;
+    color: black;
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+    border-color: grey;
+    margin: 0;
+    padding: 7px 5px;
+    cursor: pointer;
+    cursor: hand;
+}
+
+.float-icon button .icon-bar {
+    background: black;
+    width: 18px;
+}
+
+#float-menu {
+    display: block !important;
+    position: fixed;
+    bottom: 4em;
+    right: 0em;
+    background: #eee;
+    z-index: 100;
+}
+
+

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/footer.vm?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/footer.vm Fri Mar 13 21:09:25 2015
@@ -32,6 +32,25 @@ limitations under the License.
 
       </div>
 #end
+
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+#if(!$navigationsStandardMenu.empty)
+<div class="float-icon visible-xs-inline" target="#float-menu">
+    <button type="button" class="navbar-toggle">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+    </button>
+</div>
+
+<div class="col-xs-12 hidden" id="float-menu">
+    <div id="navcolumn">
+        #includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+    </div>
+</div>
+#end
+
 #if ($jetspeed.isAjaxCustomizationEnabled())
 <script src="#BaseHref()jetui/engine/portal.js"></script>
 <div id="jsPortletTemplate" class="portal-layout-cell yui-dd-draggable yui-dd-drop" style="display: none">
@@ -53,6 +72,11 @@ limitations under the License.
     <p>
       <img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
     </p>
+    <script type="text/javascript">
+        $(document.body).on("click", ".float-icon", function() {
+            $($(this).attr("target")).toggleClass("hidden");
+        });
+    </script>
 </footer>
 </body>
 </html>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/header.vm?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-green/header.vm Fri Mar 13 21:09:25 2015
@@ -62,15 +62,14 @@ var JETUI_YUI = {
 </script>
 <link rel="stylesheet" type="text/css" href="#BaseHref()jetui/css/portal.css"/>
 #end
-
-#includeHeaderResource()
-
 <meta http-equiv="Content-type" content="#ContentType()" />
 <title>#PageTitle()</title>
 <link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
-#includeJavaScriptForHead()
 <script type="text/javascript" src="#BaseHref()javascript/jquery/jquery-2.1.3.min.js"></script>
+<script type="text/javascript" src="#BaseHref()css/bootstrap/dist/js/bootstrap.min.js"></script>
+#includeHeaderResource()
 #IncludeStylesheets()
+#includeJavaScriptForHead()
 <link rel="stylesheet" type="text/css" href="#BaseHref()css/bootstrap/dist/css/bootstrap-green.css"/>
 <link rel="stylesheet" type="text/css" href="#BaseHref()decorations/layout/bootstrap-green/css/styles-new-green.css"/>
 </head>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/css/styles.css?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/css/styles.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/css/styles.css Fri Mar 13 21:09:25 2015
@@ -21,13 +21,13 @@ limitations under the License.
 * { margin:0; padding:0; }
 
 body, div, span, a, form, li, ul, ol, input, select, textarea, button, pre, blockquote, label, h1, h2, h3, h4, td, tr, th, tbody, table, p, iframe, img  {
- padding:0px;margin:0px;
- white-space:normal;
-/* font-weight:normal;
- font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;
- voice-family: "\"}\"";
- voice-family: inherit;
- font-size:8pt;*/
+    padding:0px;margin:0px;
+    white-space:normal;
+    /* font-weight:normal;
+     font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;
+     voice-family: "\"}\"";
+     voice-family: inherit;
+     font-size:8pt;*/
 }
 
 body {
@@ -35,27 +35,27 @@ body {
 }
 
 textarea, button, select, form {
- padding:1px;
+    padding:1px;
 }
 
 p {
- margin-top:4px;
- margin-bottom:4px;
+    margin-top:4px;
+    margin-bottom:4px;
 }
 
 h2 {
- margin-bottom:6px;
- color:#12293f;
- font-size:9pt;
- font-weight:bold;
+    margin-bottom:6px;
+    color:#12293f;
+    font-size:9pt;
+    font-weight:bold;
 }
 
 h3 {
- margin-bottom:4px;
- text-decoration:underline;
+    margin-bottom:4px;
+    text-decoration:underline;
 }
 
-/** 
+/**
   This white-space setting is VERY important as it keeps content from "spilling"
   outside of portlets.
   */
@@ -63,12 +63,12 @@ h3 {
 td,
 th
 {
-  white-space: normal;
+    white-space: normal;
 }
 
 th
 {
-  font-size: 11px;
+    font-size: 11px;
 }
 
 
@@ -130,9 +130,9 @@ background-position: 0px -30px
 */
 
 /* Tab hyperlink styling */
-.layout-jetspeed .LTabLow A:link, 
+.layout-jetspeed .LTabLow A:link,
 .layout-jetspeed .LTabLow A:visited,
-.layout-jetspeed .LTabLow A:hover, 
+.layout-jetspeed .LTabLow A:hover,
 .layout-jetspeed .LTabLow A:active
 {
     text-decoration: none;
@@ -148,7 +148,7 @@ background-position: 0px -30px
 
 .layout-jetspeed .LTabLow
 {
-    height:25px;    
+    height:25px;
     padding-left: 0px;
     padding-right: 0px;
 }
@@ -169,11 +169,11 @@ background-position: 0px -30px
 
 .layout-jetspeed .LTab
 {
-    height:30px;    
+    height:30px;
     padding-left: 0px;
     padding-right: 0px;
 }
- 
+
 .layout-jetspeed .LTabRight
 {
     width:10px;
@@ -182,9 +182,9 @@ background-position: 0px -30px
 }
 
 .layout-jetspeed .menu {
-/*    background:url(../images/blue_gradient.gif) #05549c;
-    padding:1px;
-    border-top:1px solid #033563;*/
+    /*    background:url(../images/blue_gradient.gif) #05549c;
+        padding:1px;
+        border-top:1px solid #033563;*/
     background: lightgrey;
 }
 
@@ -196,29 +196,29 @@ background-position: 0px -30px
 }
 
 .layout-jetspeed .menu a:hover {
-   color:black;
-   background-color: #EEE;
+    color:black;
+    background-color: #EEE;
 }
 
 .layout-jetspeed .menu a.current {
     color: black;
     cursor: default;
-    background: lightgrey !important;
+    background: #DB99B8 !important;
 }
 
 .layout-jetspeed .tabs {
-   list-style-type:none;
-   list-style-position:inside;
-   display:table;
+    list-style-type:none;
+    list-style-position:inside;
+    display:table;
 }
 
 .layout-jetspeed .tabs li {
-   float:left;
-   display:inline;
-   border-collapse:collapse;
-   margin-right:10px;
-   padding: 3px;
-   color:#fff;
+    float:left;
+    display:inline;
+    border-collapse:collapse;
+    margin-right:10px;
+    padding: 3px;
+    color:#fff;
 }
 
 .layout-jetspeed #banner h1 {
@@ -257,7 +257,7 @@ background-position: 0px -30px
     margin: 0;
 }
 
-.layout-jetspeed #leftcol 
+.layout-jetspeed #leftcol
 {
     width: 17%;
     voice-family: "\"}\"";
@@ -327,7 +327,7 @@ background-position: 0px -30px
 
 #portal-page-actions A img
 {
-   display: inline;   
+    display: inline;
 }
 
 #portal-page-actions
@@ -341,49 +341,49 @@ background-position: 0px -30px
 
 .FolderList
 {
-   display: inline;
+    display: inline;
 }
 
 .layout-jetspeed .layout-edit-bar
 {
-  width: 100%;
-  padding-top: 5px;
-  font-size: 8pt;
-  color: blue;
-  overflow:hidden;
-  clip:auto;
+    width: 100%;
+    padding-top: 5px;
+    font-size: 8pt;
+    color: blue;
+    overflow:hidden;
+    clip:auto;
 }
 
-.layout-jetspeed .layout-edit-bar label, 
-.layout-jetspeed .layout-edit-bar input, 
-.layout-jetspeed .layout-edit-bar select 
+.layout-jetspeed .layout-edit-bar label,
+.layout-jetspeed .layout-edit-bar input,
+.layout-jetspeed .layout-edit-bar select
 {
-  font-size: 11px;
-  color: #000;
+    font-size: 11px;
+    color: #000;
 }
 
 .layout-jetspeed .layout-edit-bar input
 {
-  font-size: 8pt;
+    font-size: 8pt;
 }
 
 .layout-jetspeed .layout-edit-bar-left
 {
-  display:inline;
-  float:left;
+    display:inline;
+    float:left;
 }
 
 .layout-jetspeed .layout-edit-bar-right
 {
-  display:inline;
-  float:right;
-  padding-right: 5px;
+    display:inline;
+    float:right;
+    padding-right: 5px;
 }
 
 .layout-jetspeed .portlet-edit-bar select
 {
-  font-size: 8pt;
-  color: blue;
+    font-size: 8pt;
+    color: blue;
 }
 
 
@@ -393,7 +393,7 @@ background-position: 0px -30px
 .layout-jetspeed
 {
   font-family: Verdana,sans-serif;
-  font-size: 8pt; 
+  font-size: 8pt;
 }
 
 .layout-jetspeed td{
@@ -404,67 +404,67 @@ background-position: 0px -30px
 */
 .layout-jetspeed .header {
     width:100%;
-    background:grey;
-    border-bottom:4px solid #eef0f0;
+    background:#b77e8d;
+    border-bottom:4px solid #b77e8d;
     margin:0px;
 }
 
 .layout-jetspeed .logo {
-text-indent: -9999px;   
-background: url("../images/jetspeed-logo.gif") no-repeat;
-background-position: 8px 8px;
-height:35px;
-padding:3px;
+    text-indent: -9999px;
+    background: url("../images/jetspeed-logo.gif") no-repeat;
+    background-position: 8px 8px;
+    height:35px;
+    padding:3px;
 }
 
 /* Logout */
 /* ================================================ */
 .layout-jetspeed .layout-jetspeed-logout {
-position: absolute; 
-right: 5px; top: 5px; 
-z-index: 10;  
-color: #fff;
-padding:2px;
-text-decoration:none;
-font-size:8pt;
+    position: absolute;
+    right: 5px; top: 5px;
+    z-index: 10;
+    color: #fff;
+    padding:2px;
+    text-decoration:none;
+    font-size:8pt;
 }
 
 .layout-jetspeed .layout-search {
-position: absolute; 
-right: 22px; top: 18px; 
-color: #000;
-padding:2px;
-text-decoration:none;
+    position: absolute;
+    right: 22px; top: 18px;
+    color: #000;
+    padding:2px;
+    text-decoration:none;
 }
 
 .layout-jetspeed .layout-search2 {
-position: absolute; 
-right: 3px; top: 21px; 
+    position: absolute;
+    right: 3px; top: 21px;
 }
 
 .layout-jetspeed .layout-horizontal-menu {
-position:absolute;
-display:none;
-left:300px;
-top:10px;
+    position:absolute;
+    display:none;
+    left:300px;
+    top:10px;
 }
 
 .layout-jetspeed .layout-statusarea {
-position: absolute; 
-right: 2px; top: 12px; 
-color: #fff;
-padding:2px;
-text-decoration:none;
-font-size:8pt;
+    position: absolute;
+    right: 2px; top: 12px;
+    color: #fff;
+    padding:2px;
+    text-decoration:none;
+    font-size:8pt;
 }
 .layyout-jetspeed .layout-statusarea A:visited,
 .layout-jetspeed .layout-statusarea A {
-color: #fff;
-font-size:8pt;
+    color: #fff;
+    font-size:8pt;
 }
 
 .layout-jetspeed .layout-jetspeed-logout:hover{
-text-decoration: underline;
+    text-decoration: underline;
 }
 
 .layout-jetspeed .tooltext { font-size: 8pt; }
@@ -488,36 +488,36 @@ text-decoration: underline;
 
 .layout-jetspeed-logout{float: right; display: block;}
 
-.layout-jetspeed .portal-page-actions{ 
-margin-bottom: 0px; 
-float: right;
+.layout-jetspeed .portal-page-actions{
+    margin-bottom: 0px;
+    float: right;
 
 }
 .layout-jetspeed .portal-page-actions li{display: block; float: left; margin-left: 10px;}
 .layout-jetspeed .portal-page-actions a{
-background-image: none;
-color: white;
-text-decoration: underline;
+    background-image: none;
+    color: white;
+    text-decoration: underline;
 }
 .layout-jetspeed .portal-page-actions a span{}
 
 .layout-jetspeed .layout-edit-bar {
-background: #f2f2f2 url("../images/layout-bar-shade.png") repeat-x left bottom;
-padding-bottom: 15px;
-width: 100%;
-clear:both;
+    background: #f2f2f2 url("../images/layout-bar-shade.png") repeat-x left bottom;
+    padding-bottom: 15px;
+    width: 100%;
+    clear:both;
 }
 .layout-jetspeed .layout-edit-bar tr td{padding: 4px; vertical-align: top}
 .layout-jetspeed .layout-portlet-move{float: left;}
 .layout-jetspeed .layout-portlet-move li{float: left; display: block}
 .layout-jetspeed .layout-portlet-move a{
-display: block;
-float: left;
-width: 16px; 
-height: 16px;
-background-repeat: no-repeat;
-background-position: 0px 0px;
-margin-left: 2px;
+    display: block;
+    float: left;
+    width: 16px;
+    height: 16px;
+    background-repeat: no-repeat;
+    background-position: 0px 0px;
+    margin-left: 2px;
 }
 .layout-jetspeed .layout-portlet-move a:hover{background-position: 0px -16px}
 .layout-jetspeed .layout-portlet-move a span{display: none}
@@ -540,47 +540,47 @@ margin-left: 2px;
 
 .layout-jetspeed .layout-jetspeed-addportlet{padding: 25px; background: #f2f2f2; text-align: center;}
 .layout-jetspeed .layout-jetspeed-addportlet a{
-background: url("../images/addportlet.png") no-repeat; 
-width: 146px; height: 30px;
-padding: 10px 48px 13px 35px;
-background-position: 0px 0px;
-color: white;
+    background: url("../images/addportlet.png") no-repeat;
+    width: 146px; height: 30px;
+    padding: 10px 48px 13px 35px;
+    background-position: 0px 0px;
+    color: white;
 }
 .layout-jetspeed .layout-jetspeed-addportlet a:hover{
-background-position: 0px -39px;
+    background-position: 0px -39px;
 }
 
 /* Layout configuration inside a portlet */
 
 .layout-jetspeed .portal-layout-cell .portal-layout-cell .layout-edit-bar{
-padding: 0px; 
-background: #f2f2f2 url("../images/portletheadingback.png") repeat-x top left;
-padding-top: 24px;
-padding-bottom: 5px;
-margin-bottom: 10px;
+    padding: 0px;
+    background: #f2f2f2 url("../images/portletheadingback.png") repeat-x top left;
+    padding-top: 24px;
+    padding-bottom: 5px;
+    margin-bottom: 10px;
 }
 
 .layout-jetspeed .portal-layout-cell .layout-edit-bar b{padding-right: 0px}
 .layout-jetspeed .portal-layout-cell .layout-edit-bar .layout-title{
-padding: 4px;
+    padding: 4px;
 }
 
 .layout-jetspeed .portlet-edit-bar{
-background: url("../images/portlet-layout-bar-back.gif") no-repeat top left; 
-height: 18px;
-margin: 10px;
-margin-bottom: -5px;
-padding: 1px;
+    background: url("../images/portlet-layout-bar-back.gif") no-repeat top left;
+    height: 18px;
+    margin: 10px;
+    margin-bottom: -5px;
+    padding: 1px;
 }
 .layout-jetspeed .portlet-edit-bar a{display: block ; float: left; margin-top: 2px;}
 .layout-jetspeed .portlet-edit-bar select{width: 120px;}
 .layout-jetspeed .portlet-edit-bar label{
-float: left; 
-color: white; 
-display: block; 
-margin-top: 2px; 
-padding: 2px;
-font-weight: bold;
+    float: left;
+    color: white;
+    display: block;
+    margin-top: 2px;
+    padding: 2px;
+    font-weight: bold;
 }
 
 .layout-jetspeed .portlet-edit-bar select{background: transparent; border: 1px solid #666666; float: left; color: white; padding: 0px; height: 18px;}
@@ -602,3 +602,39 @@ font-weight: bold;
     margin-left: 0px;
     clear: both;
 }
+
+/**/
+
+.float-icon {
+    position: fixed;
+    right: 0px;
+    bottom: 1em;
+}
+
+.float-icon button {
+    float: none;
+    background: #aaa;
+    color: black;
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+    border-color: grey;
+    margin: 0;
+    padding: 7px 5px;
+    cursor: pointer;
+    cursor: hand;
+}
+
+.float-icon button .icon-bar {
+    background: black;
+    width: 18px;
+}
+
+#float-menu {
+    display: block !important;
+    position: fixed;
+    bottom: 4em;
+    right: 0em;
+    background: #eee;
+    z-index: 100;
+}
+

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/footer.vm?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/footer.vm Fri Mar 13 21:09:25 2015
@@ -32,6 +32,25 @@ limitations under the License.
 
       </div>
 #end
+
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+#if(!$navigationsStandardMenu.empty)
+<div class="float-icon visible-xs-inline" target="#float-menu">
+    <button type="button" class="navbar-toggle">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+    </button>
+</div>
+
+<div class="col-xs-12 hidden" id="float-menu">
+    <div id="navcolumn">
+        #includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+    </div>
+</div>
+#end
+
 #if ($jetspeed.isAjaxCustomizationEnabled())
 <script src="#BaseHref()jetui/engine/portal.js"></script>
 <div id="jsPortletTemplate" class="portal-layout-cell yui-dd-draggable yui-dd-drop" style="display: none">
@@ -53,6 +72,11 @@ limitations under the License.
     <p>
       <img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
     </p>
+    <script type="text/javascript">
+        $(document.body).on("click", ".float-icon", function() {
+            $($(this).attr("target")).toggleClass("hidden");
+        });
+    </script>
 </footer>
 </body>
 </html>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/header.vm?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap-red/header.vm Fri Mar 13 21:09:25 2015
@@ -62,15 +62,14 @@ var JETUI_YUI = {
 </script>
 <link rel="stylesheet" type="text/css" href="#BaseHref()jetui/css/portal.css"/>
 #end
-
-#includeHeaderResource()
-
 <meta http-equiv="Content-type" content="#ContentType()" />
 <title>#PageTitle()</title>
 <link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
-#includeJavaScriptForHead()
 <script type="text/javascript" src="#BaseHref()javascript/jquery/jquery-2.1.3.min.js"></script>
+<script type="text/javascript" src="#BaseHref()css/bootstrap/dist/js/bootstrap.min.js"></script>
+#includeHeaderResource()
 #IncludeStylesheets()
+#includeJavaScriptForHead()
 <link rel="stylesheet" type="text/css" href="#BaseHref()css/bootstrap/dist/css/bootstrap-red.css"/>
 <link rel="stylesheet" type="text/css" href="#BaseHref()decorations/layout/bootstrap-red/css/styles-new-red.css"/>
 </head>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/css/styles.css?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/css/styles.css (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/css/styles.css Fri Mar 13 21:09:25 2015
@@ -602,3 +602,38 @@ font-weight: bold;
     margin-left: 0px;
     clear: both;
 }
+
+/**/
+
+.float-icon {
+    position: fixed;
+    right: 0px;
+    bottom: 1em;
+}
+
+.float-icon button {
+    float: none;
+    background: #aaa;
+    color: black;
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+    border-color: grey;
+    margin: 0;
+    padding: 7px 5px;
+    cursor: pointer;
+    cursor: hand;
+}
+
+.float-icon button .icon-bar {
+    background: black;
+    width: 18px;
+}
+
+#float-menu {
+    display: block !important;
+    position: fixed;
+    bottom: 4em;
+    right: 0em;
+    background: #eee;
+    z-index: 100;
+}
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/footer.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/footer.vm?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/footer.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/footer.vm Fri Mar 13 21:09:25 2015
@@ -32,6 +32,25 @@ limitations under the License.
 
       </div>
 #end
+
+#set($navigationsStandardMenu = $site.getMenu("navigations"))
+#if(!$navigationsStandardMenu.empty)
+<div class="float-icon visible-xs-inline" target="#float-menu">
+    <button type="button" class="navbar-toggle">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+    </button>
+</div>
+
+<div class="col-xs-12 hidden" id="float-menu">
+    <div id="navcolumn">
+        #includeLinksWithIconNavigation($navigationsStandardMenu $TOP_TO_BOTTOM)
+    </div>
+</div>
+#end
+
 #if ($jetspeed.isAjaxCustomizationEnabled())
 <script src="#BaseHref()jetui/engine/portal.js"></script>
 <div id="jsPortletTemplate" class="portal-layout-cell yui-dd-draggable yui-dd-drop" style="display: none">
@@ -53,6 +72,11 @@ limitations under the License.
     <p>
       <img src="#GetPageResource('images/Jetspeed_blue_sm.png')" alt="Jetspeed 2 Powered" border="0" />
     </p>
+    <script type="text/javascript">
+        $(document.body).on("click", ".float-icon", function() {
+            $($(this).attr("target")).toggleClass("hidden");
+        });
+    </script>
 </footer>
 </body>
 </html>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/header.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/header.vm?rev=1666582&r1=1666581&r2=1666582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/header.vm (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/bootstrap/header.vm Fri Mar 13 21:09:25 2015
@@ -62,15 +62,14 @@ var JETUI_YUI = {
 </script>
 <link rel="stylesheet" type="text/css" href="#BaseHref()jetui/css/portal.css"/>
 #end
-
-#includeHeaderResource()
-
 <meta http-equiv="Content-type" content="#ContentType()" />
 <title>#PageTitle()</title>
 <link rel="shortcut icon" href="#BaseHref()images/jetspeed.jpg" type="image/x-icon" />
-#includeJavaScriptForHead()
 <script type="text/javascript" src="#BaseHref()javascript/jquery/jquery-2.1.3.min.js"></script>
+<script type="text/javascript" src="#BaseHref()css/bootstrap/dist/js/bootstrap.min.js"></script>
+#includeHeaderResource()
 #IncludeStylesheets()
+#includeJavaScriptForHead()
 <link rel="stylesheet" type="text/css" href="#BaseHref()css/bootstrap/dist/css/bootstrap.css"/>
 <link rel="stylesheet" type="text/css" href="#BaseHref()decorations/layout/bootstrap/css/styles-new.css"/>
 </head>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message