svn commit: r1838072 - in /ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone: ./ fonts/quicksand/
Author: jnicolas
Date: Wed Aug 15 08:42:00 2018
New Revision: 1838072
URL: http://svn.apache.org/viewvc?rev=1838072&view=rev
Log:
Improved: Change font Title|to match with the initial implementation
(OFBIZ-10513)
Tanks: Marine DESMARCHELIER for her help to understand the reason that it
wasn't work
Added:
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff2
(with props)
Removed:
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/Quicksand
SIL OFL License 1.1.txt
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksandbold.otf
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksandbook.otf
Modified:
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
Added:
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff?rev=1838072&view=auto
==
(empty)
Added:
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff2
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff2?rev=1838072&view=auto
==
Binary file - no diff available.
Propchange:
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff2
--
svn:mime-type = application/octet-stream
Modified:
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less?rev=1838072&r1=1838071&r2=1838072&view=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
Wed Aug 15 08:42:00 2018
@@ -40,19 +40,13 @@
@box-border-color: #d7d7d7;
@font-face {
- font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
- src: url('fonts/quicksand/quicksandbold.otf');
+ font-family: 'quicksandregular';
+ src: url('fonts/quicksand/quicksand-regular.woff2') format('woff2'),
+ url('fonts/quicksand/quicksand-regular.woff') format('woff');
font-weight: normal;
font-style: normal;
}
-@font-face {
- font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
- src: url('fonts/quicksand/quicksandbold.otf');
- font-weight: bold;
- font-style: normal;
-}
-
/* -- */
/* Begin special checkbox type switch */
/* -- */
@@ -116,7 +110,7 @@
padding-left: 35px;
position: relative;
cursor: pointer;
- font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
+ font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
font-size: 12px;
}
@@ -503,7 +497,7 @@ li.line-odd {
flex-direction: row;
align-items: center;
justify-content: space-between;
- font-family: Quicksand,sans-serif;
+ font-family: quicksandregular,sans-serif;
background-color: @dark-color-theme;
z-index: 5;
height: @app-bar-height;
@@ -822,7 +816,7 @@ a.user-pref-btn {
min-width: 75px;
padding-left: 6px;
padding-right: 6px;
-font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
+font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
border-bottom: solid 1px @black;
font-size: 12px;
@media screen and (max-width: 1500px) {
@@ -1039,7 +1033,7 @@ a.user-pref-btn {
padding: 5px 10px 5px 10px;
border-bottom: solid 1px @black;
span {
- font-family: "Quicksand", Arial, "Lucida Grande", sans-serif !important;
+ font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif
!important;
font-size: 15px;
font-weight: bold;
width: 110px;
@@ -1485,7 +1479,7 @@ form .basic-table,
.info-message-title {
min-width:150px;
margin: 5px;
- font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
+ font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
font-size: 16px;
font-weight: bold;
}
@@ -1528,7 +1522,7 @@ form .basic-table,
table.msg-list {
width: 100%;
font-size: 16px;
- font-family: "Quicksand", Ari
svn commit: r1838073 - in /ofbiz/ofbiz-framework/trunk/themes/rainbowstone: template/includes/TopAppBar.ftl webapp/rainbowstone/rainbowstone-main-theme.less
Author: jnicolas
Date: Wed Aug 15 08:50:28 2018
New Revision: 1838073
URL: http://svn.apache.org/viewvc?rev=1838073&view=rev
Log:
Improve: Main menu enhancement
(OFBIZ-10521)
The main menu in rainbowstone theme don't display more than 9 items, pending
items are included in the + menu.
The problem is that it's not really clear to know where you are or to simply
click again on the webapp link to be redirected to the main target.
Modified:
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
Modified:
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl?rev=1838073&r1=1838072&r2=1838073&view=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/TopAppBar.ftl
Wed Aug 15 08:50:28 2018
@@ -166,6 +166,9 @@ under the License.
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}
+<#if selected>
+<#assign currentMoreApp = display>
+
<#assign appCount = appCount + 1>
@@ -201,6 +204,9 @@ under the License.
title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else>
title="${display.description}">${display.title}
+<#if selected>
+<#assign currentMoreApp = display>
+
<#assign appCount = appCount + 1>
@@ -210,6 +216,23 @@ under the License.
+
+<#if currentMoreApp?exists>
+
+<#assign thisApp = currentMoreApp.getContextRoot()>
+<#assign thisApp = StringUtil.wrapString(thisApp)>
+<#assign thisURL = thisApp>
+<#if thisApp != "/">
+<#assign thisURL = thisURL + "/control/main">
+
+
+
+
title="${uiLabelMap[currentMoreApp.description]}">${uiLabelMap[currentMoreApp.title]}<#else>
title="${currentMoreApp.description}">${currentMoreApp.title}
+
+
+
+
+
Modified:
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less?rev=1838073&r1=1838072&r2=1838073&view=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
Wed Aug 15 08:50:28 2018
@@ -577,6 +577,10 @@ li.line-odd {
text-decoration: none;
}
+.more-current-app {
+ margin-left: 10px;
+}
+
#app-bar-line {
position: relative;
width: 100%;
@@ -630,6 +634,7 @@ li.line-odd {
li {
padding-left : 4px;
padding-right: 4px;
+padding-top: 2px;
}
a {
@@ -647,6 +652,7 @@ li.line-odd {
box-shadow: none;
text-decoration: none;
border-radius: 0;
+ padding-top:4px;
}
}
@@ -662,28 +668,6 @@ li.line-odd {
}
}
-#homeButton {
- display: flex;
- //visibility: hidden;
- align-items: center;
- justify-content: center;
- background-color:@grey;
- border: none;
- border-radius : 0;
-
- height: @app-bar-height;
- width : @home-btn-width;
- text-decoration: none;
- img {
-height: 25px;
-transition: all .2s ease-in-out;
- }
-}
-
-#homeButton:hover img {
- transform: scale(1.1);
-}
-
#app-bar-list {
display: flex;
}
@@ -872,7 +856,7 @@ a.user-pref-btn {
content: '';
position: absolute;
top: -2px;
-left: 5px;
+left: calc(50% - 10px);
width: 0;
height: 0;
border-right: 10px solid transparent;
@@ -1002,23 +986,6 @@ a.user-pref-btn {
height: @app-bar-height ;
}
-#homeGlyph {
- margin-left: 20px;
- height: 20px;
-}
-
-#homePageTitle {
- color: @white;
- font-size: 20px;
- font-weight: bold;
- margin-right: 20px;
- margin-left: 20px;
-}
-.home-menu-list {
- display: flex;
- flex-direction: column;
- align-items: center;
-}
.hp-applist {
display: flex;
flex-direction: row;
svn commit: r1838074 - in /ofbiz/ofbiz-framework/trunk/themes: bluelight/template/ common-theme/template/includes/ common-theme/webapp/images/ common-theme/widget/ flatgrey/template/ rainbowstone/temp
Author: jnicolas
Date: Wed Aug 15 09:15:13 2018
New Revision: 1838074
URL: http://svn.apache.org/viewvc?rev=1838074&view=rev
Log:
Improve: Change the uggly favicon with the new one ! | Using new OFBiz logo
(OFBIZ-10522)
Added:
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-32.png
(with props)
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-64.png
(with props)
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-96.png
(with props)
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.ico
(with props)
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.png
(with props)
Modified:
ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl
ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/CommonScreens.xml
ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/Theme.xml
ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl
ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl
Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl?rev=1838074&r1=1838073&r2=1838074&view=diff
==
--- ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl Wed Aug 15
09:15:13 2018
@@ -35,7 +35,11 @@ under the License.
<#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON />
<#if shortcutIcon?has_content>
-
+"
type="image/x-icon">
+"
type="image/png">
+"
type="image/png">
+"
type="image/png">
+"
type="image/png">
<#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl?rev=1838074&r1=1838073&r2=1838074&view=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl
Wed Aug 15 09:15:13 2018
@@ -29,7 +29,13 @@ under the License.
${layoutSettings.companyName!}
: <#if
(titleProperty)?has_content>${uiLabelMap[titleProperty]}<#else>${title!}
<#if layoutSettings.shortcutIcon?has_content>
-
+<#if shortcutIcon?has_content>
+"
type="image/x-icon">
+"
type="image/png">
+"
type="image/png">
+"
type="image/png">
+"
type="image/png">
+
<#if layoutSettings.javaScripts?has_content>
<#--layoutSettings.javaScripts is a list of java scripts. -->
Added:
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-32.png
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-32.png?rev=1838074&view=auto
==
Binary file - no diff available.
Propchange:
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-32.png
--
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-32.png
--
svn:mime-type = image/png
Added:
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-64.png
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-64.png?rev=1838074&view=auto
==
Binary file - no diff available.
Propchange:
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-64.png
--
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-64.png
--
svn:mime-type = image/png
Added:
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-96.png
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-96.png?rev=1838074&view=auto
===
svn commit: r1838080 - /ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
Author: shijh
Date: Wed Aug 15 11:40:19 2018
New Revision: 1838080
URL: http://svn.apache.org/viewvc?rev=1838080&view=rev
Log:
Implemented: Remove org.apache.tomcat.util.net.secure_protocol_version from
json output
OFBIZ-10443
Add org.apache.tomcat.util.net.secure_protocol_version to ignoreAttrs.
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java?rev=1838080&r1=1838079&r2=1838080&view=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
Wed Aug 15 11:40:19 2018
@@ -72,7 +72,8 @@ public class CommonEvents {
"targetRequestUri",
"_SERVER_ROOT_URL_",
"_CONTROL_PATH_",
-"thisRequestUri"
+"thisRequestUri",
+"org.apache.tomcat.util.net.secure_protocol_version"
};
/** Simple event to set the users per-session locale setting. The user's
locale
svn commit: r1838081 - in /ofbiz/ofbiz-framework/trunk/framework: base/src/main/java/org/apache/ofbiz/base/util/collections/ base/src/test/java/org/apache/ofbiz/base/collections/ webapp/config/ webapp
Author: shijh
Date: Wed Aug 15 11:45:45 2018
New Revision: 1838081
URL: http://svn.apache.org/viewvc?rev=1838081&view=rev
Log:
Implemented: Add method attribute to request-map to controll a uri can be
called GET or POST only
OFBIZ-10438
Thanks: Mathieu Lirzin for the contribution.
Added:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java
(with props)
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContextAdapter.java
(with props)
ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/collections/
ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextAdapterTests.java
(with props)
ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/collections/MultivaluedMapContextTests.java
(with props)
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/MethodNotAllowedException.java
(with props)
ofbiz/ofbiz-framework/trunk/framework/webapp/src/test/java/org/apache/ofbiz/webapp/control/RequestHandlerTests.java
(with props)
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/config/WebappUiLabels.xml
ofbiz/ofbiz-framework/trunk/framework/webapp/dtd/site-conf.xsd
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
Added:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java?rev=1838081&view=auto
==
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java
(added)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MultivaluedMapContext.java
Wed Aug 15 11:45:45 2018
@@ -0,0 +1,87 @@
+/***
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "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.
+
***/
+package org.apache.ofbiz.base.util.collections;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * MultivaluedMap Context
+ *
+ * A MapContext which handles multiple values for the same key.
+ */
+public class MultivaluedMapContext extends MapContext> {
+
+public static final String module = MultivaluedMapContext.class.getName();
+
+/**
+ * Create a multi-value map initialized with one context
+ */
+public MultivaluedMapContext() {
+push();
+}
+
+/**
+ * Associate {@code key} with the single value {@code value}.
+ * If other values are already associated with {@code key} then override
them.
+ *
+ * @param key the key to associate {@code value} with
+ * @param value the value to add to the context
+ */
+public void putSingle(K key, V value) {
+List box = new LinkedList<>();
+box.add(value);
+put(key, box);
+}
+
+/**
+ * Associate {@code key} with the single value {@code value}.
+ * If other values are already associated with {@code key},
+ * then add {@code value} to them.
+ *
+ * @param key the key to associate {@code value} with
+ * @param value the value to add to the context
+ */
+public void add(K key, V value) {
+List cur = contexts.getFirst().get(key);
+if (cur == null) {
+cur = new LinkedList<>();
+/* if this method is called after a context switch, copy the
previous values
+ in current context to not mask them. */
+
buildbot success in on ofbizTrunkFramework
The Buildbot has detected a restored build on builder ofbizTrunkFramework while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/361 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1838081 Blamelist: shijh Build succeeded! Sincerely, -The Buildbot
