-
-
-
-
- - " border="0" title="<%=Prop.getProperty(Prop.LOCAL_TEXT)%>"/> - -
<%=Prop.getProperty(Prop.LOCAL_TEXT)%>
-
-
-
-
- - " border="0" title="<%=Prop.getProperty(Prop.RESOURCE_TEXT)%>"/> - -
<%=Prop.getProperty(Prop.RESOURCE_TEXT)%>
-
-
-
-
- - " border="0" title="<%=Prop.getProperty(Prop.WEBSTORE_TEXT)%>"/> - -
<%=Prop.getProperty(Prop.WEBSTORE_TEXT)%>
-
-
-
-
- - " border="0" title="<%=Prop.getProperty(Prop.SENDREQUEST_TEXT)%>"/> - -
<%=Prop.getProperty(Prop.SENDREQUEST_TEXT)%>
-
-
-
-
-
-
-
-
- - " border="0" title="<%=Prop.getProperty(Prop.IRC_TEXT)%>"/> - -
<%=Prop.getProperty(Prop.IRC_TEXT)%>
-
-
-
-
- - " border="0" title="<%=Prop.getProperty(Prop.WIKI_TEXT)%>"/> - -
<%=Prop.getProperty(Prop.WIKI_TEXT)%>
-
-
-
-
- - " border="0" title="<%=Prop.getProperty(Prop.FORUMS_TEXT)%>"/> - -
<%=Prop.getProperty(Prop.FORUMS_TEXT)%>
-
-
-
-
- - " border="0" title="<%=Prop.getProperty(Prop.SUPPORTREQUEST_TEXT)%>"/> - -
<%=Prop.getProperty(Prop.SUPPORTREQUEST_TEXT)%>
-
-
-
+
" border="0"/> diff --git a/org.adempiere.server/resources/templates/black/styles/template.css b/org.adempiere.server/resources/templates/black/styles/template.css index 8350b0fd34..e798d8cdd3 100644 --- a/org.adempiere.server/resources/templates/black/styles/template.css +++ b/org.adempiere.server/resources/templates/black/styles/template.css @@ -73,14 +73,53 @@ div.body{ top:262px; } -.topBtn{ - margin-left: 0px; +#main-docuBtns ul { + margin:0; + padding:28px; + overflow:hidden; + list-style:none; +} +#main-docuBtns ul li { + display: inline-block; + height:120px; + width:120px; + padding:18px 0; + text-align:center; + background-color: #111; + margin: 2px; +} +#main-docuBtns ul li > a { + width: 100%; + height: 95%; + display: inline-block; +} +#main-docuBtns ul li > a > img { + position: relative; + top: 50%; + transform: translate(0%,-45%); +} +.main-txt-btn { + padding-top:2px; + padding-bottom:2px; + color: #fff; +} +#main-requestBtns-btnLogin{ + overflow: hidden; + filter:alpha(opacity=60); + opacity: 0.6; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + -ms-transition: all 0.5s ease; + transition: all 0.5s ease; +} +#main-requestBtns-btnLogin:hover{ + filter:alpha(opacity=100); + opacity: 1; } #main-requestBtns-btnReq{ overflow: hidden; - width: 70px; - height:53px; filter:alpha(opacity=60); opacity: 0.6; -webkit-transition: all 0.5s ease; @@ -90,16 +129,12 @@ div.body{ transition: all 0.5s ease; } #main-requestBtns-btnReq:hover{ - width: 181px; - height: 53px; filter:alpha(opacity=100); opacity: 1; } #main-requestBtns-btnSendReq{ overflow: hidden; - width: 70px; - height:53px; filter:alpha(opacity=60); opacity: 0.6; -webkit-transition: all 0.5s ease; @@ -109,16 +144,12 @@ div.body{ transition: all 0.5s ease; } #main-requestBtns-btnSendReq:hover{ - width: 181px; - height: 53px; filter:alpha(opacity=100); opacity: 1; } #main-requestBtns-btnLocSupp{ overflow: hidden; - width: 70px; - height:53px; filter:alpha(opacity=60); opacity: 0.6; -webkit-transition: all 0.5s ease; @@ -128,16 +159,12 @@ div.body{ transition: all 0.5s ease; } #main-requestBtns-btnLocSupp:hover{ - width: 181px; - height: 53px; filter:alpha(opacity=100); opacity: 1; } #main-requestBtns-btnResoc{ overflow: hidden; - width: 70px; - height:53px; filter:alpha(opacity=60); opacity: 0.6; -webkit-transition: all 0.5s ease; @@ -147,16 +174,12 @@ div.body{ transition: all 0.5s ease; } #main-requestBtns-btnResoc:hover{ - width: 181px; - height: 53px; filter:alpha(opacity=100); opacity: 1; } #main-docuBtns-btnIrc{ overflow: hidden; - width: 70px; - height:53px; filter:alpha(opacity=60); opacity: 0.6; -webkit-transition: all 0.5s ease; @@ -166,16 +189,12 @@ div.body{ transition: all 0.5s ease; } #main-docuBtns-btnIrc:hover{ - width: 181px; - height: 53px; filter:alpha(opacity=100); opacity: 1; } #main-docuBtns-btnWiki{ overflow: hidden; - width: 70px; - height:53px; filter:alpha(opacity=60); opacity: 0.6; -webkit-transition: all 0.5s ease; @@ -185,16 +204,12 @@ div.body{ transition: all 0.5s ease; } #main-docuBtns-btnWiki:hover{ - width: 181px; - height: 53px; filter:alpha(opacity=100); opacity: 1; } #main-docuBtns-btnForum{ overflow: hidden; - width: 70px; - height:53px; filter:alpha(opacity=60); opacity: 0.6; -webkit-transition: all 0.5s ease; @@ -204,16 +219,12 @@ div.body{ transition: all 0.5s ease; } #main-docuBtns-btnForum:hover{ - width: 181px; - height: 53px; filter:alpha(opacity=100); opacity: 1; } #main-docuBtns-btnSuppReq{ overflow: hidden; - width: 70px; - height:53px; filter:alpha(opacity=60); opacity: 0.6; -webkit-transition: all 0.5s ease; @@ -223,8 +234,6 @@ div.body{ transition: all 0.5s ease; } #main-docuBtns-btnSuppReq:hover{ - width: 181px; - height: 53px; filter:alpha(opacity=100); opacity: 1; } @@ -235,32 +244,11 @@ div.body{ .btnResoc-content{ position: relative; } -.main-txt-btn{ - font-size: 9px; - left: 90px; - position: absolute; - top: 20px; - width: 100%; - cursor: pointer; -} .main-content{ position: relative; height: 550px; } -.main-login{ - bottom: 25px; - position: absolute; - right: 150px; -} -.main-login img{ - filter:alpha(opacity=60); - opacity: 0.6; -} -.main-login img:hover{ - filter:alpha(opacity=100); - opacity: 1; -} #main-rssContent{ position: absolute; right: 50px; diff --git a/org.adempiere.server/resources/templates/white/images/img_webui.png b/org.adempiere.server/resources/templates/white/images/img_webui.png index ce85dd9552..7d1807e9bb 100644 Binary files a/org.adempiere.server/resources/templates/white/images/img_webui.png and b/org.adempiere.server/resources/templates/white/images/img_webui.png differ diff --git a/org.adempiere.server/resources/templates/white/styles/template.css b/org.adempiere.server/resources/templates/white/styles/template.css index 2757ab3fa5..47f182b099 100644 --- a/org.adempiere.server/resources/templates/white/styles/template.css +++ b/org.adempiere.server/resources/templates/white/styles/template.css @@ -47,14 +47,14 @@ div.body{ padding-top: 70px; } #main-background{ - height: 396px; + height: 496px; position: absolute; - top: 71px; + top: 1px; width: 810px; z-index: -1000; } #main-background img{ - height: 396px; + height: 496px; width: 810px; } .topBtnHeader{ @@ -63,55 +63,10 @@ div.body{ .topBtnFooter{ margin-top: 50px; } -.topBtn{ - border-top: 2px solid #59595B; - border-right: 2px solid #59595B; - float:left; - width: 200px; - height:70px; -} -.topBtn img{ - padding-top: 10px; - width: 200px; - height: 50px; - filter:alpha(opacity=80); - opacity: 0.8; -} -.bottomBtn{ - border-bottom: 2px solid #59595B; - border-right: 2px solid #59595B; - float:left; - width: 200px; - height:70px; -} -.bottomBtn img{ - padding-top: 10px; - width: 200px; - height: 50px; - filter:alpha(opacity=80); - opacity: 0.8; -} -.topBtn img:hover{ - filter:alpha(opacity=100); - opacity: 1; -} .main-content{ position: relative; height: 550px; } -.main-login{ - bottom: 150px; - position: absolute; - right: 100px; -} -.main-login img{ - filter:alpha(opacity=60); - opacity: 0.6; -} -.main-login img:hover{ - filter:alpha(opacity=100); - opacity: 1; -} .btnDocu-content{ position: relative; } @@ -119,36 +74,170 @@ div.body{ position: relative; } -.main-txt-btn{ - font-size: 11px; - left: 90px; - position: absolute; - top: 25px; - cursor: pointer; - z-index: -1000; +#main-docuBtns ul { + margin:0; + padding:28px; + overflow:hidden; + list-style:none; +} +#main-docuBtns ul li { + display: inline-block; + height:110px; + width:120px; + padding:18px 0; + text-align:center; + background-color: #fff; + margin: 2px; +} +#main-docuBtns ul li > a { + width: 100%; + height: 95%; + display: inline-block; +} +#main-docuBtns ul li > a > img { + position: relative; + top: 50%; + transform: translate(0%,-45%); +} +.main-txt-btn { + padding-top:2px; + padding-bottom:2px; + color: #333; +} +#main-requestBtns-btnLogin{ + overflow: hidden; + filter:alpha(opacity=60); + opacity: 0.6; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + -ms-transition: all 0.5s ease; + transition: all 0.5s ease; +} +#main-requestBtns-btnLogin:hover{ + filter:alpha(opacity=100); + opacity: 1; } #main-requestBtns-btnReq{ - -moz-border-top-left-radius: 15px; - border-top-left-radius: 15px; - border-left: 2px solid #59595B; + overflow: hidden; + filter:alpha(opacity=60); + opacity: 0.6; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + -ms-transition: all 0.5s ease; + transition: all 0.5s ease; } -#main-requestBtns-btnResoc{ - -moz-border-top-right-radius: 15px; - border-top-right-radius: 15px; - border-right: 2px solid #59595B; -} -#main-docuBtns-btnIrc{ - -moz-border-bottom-left-radius: 15px; - border-bottom-left-radius: 15px; - border-left: 2px solid #59595B; -} -#main-docuBtns-btnSuppReq{ - -moz-border-bottom-right-radius: 15px; - border-bottom-right-radius: 15px; - border-right: 2px solid #59595B; +#main-requestBtns-btnReq:hover{ + filter:alpha(opacity=100); + opacity: 1; } +#main-requestBtns-btnSendReq{ + overflow: hidden; + filter:alpha(opacity=60); + opacity: 0.6; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + -ms-transition: all 0.5s ease; + transition: all 0.5s ease; +} +#main-requestBtns-btnSendReq:hover{ + filter:alpha(opacity=100); + opacity: 1; +} + +#main-requestBtns-btnLocSupp{ + overflow: hidden; + filter:alpha(opacity=60); + opacity: 0.6; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + -ms-transition: all 0.5s ease; + transition: all 0.5s ease; +} +#main-requestBtns-btnLocSupp:hover{ + filter:alpha(opacity=100); + opacity: 1; +} + +#main-requestBtns-btnResoc{ + overflow: hidden; + filter:alpha(opacity=60); + opacity: 0.6; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + -ms-transition: all 0.5s ease; + transition: all 0.5s ease; +} +#main-requestBtns-btnResoc:hover{ + filter:alpha(opacity=100); + opacity: 1; +} + +#main-docuBtns-btnIrc{ + overflow: hidden; + filter:alpha(opacity=60); + opacity: 0.6; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + -ms-transition: all 0.5s ease; + transition: all 0.5s ease; +} +#main-docuBtns-btnIrc:hover{ + filter:alpha(opacity=100); + opacity: 1; +} + +#main-docuBtns-btnWiki{ + overflow: hidden; + filter:alpha(opacity=60); + opacity: 0.6; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + -ms-transition: all 0.5s ease; + transition: all 0.5s ease; +} +#main-docuBtns-btnWiki:hover{ + filter:alpha(opacity=100); + opacity: 1; +} + +#main-docuBtns-btnForum{ + overflow: hidden; + filter:alpha(opacity=60); + opacity: 0.6; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + -ms-transition: all 0.5s ease; + transition: all 0.5s ease; +} +#main-docuBtns-btnForum:hover{ + filter:alpha(opacity=100); + opacity: 1; +} + +#main-docuBtns-btnSuppReq{ + overflow: hidden; + filter:alpha(opacity=60); + opacity: 0.6; + -webkit-transition: all 0.5s ease; + -moz-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + -ms-transition: all 0.5s ease; + transition: all 0.5s ease; +} +#main-docuBtns-btnSuppReq:hover{ + filter:alpha(opacity=100); + opacity: 1; +} #main-rssContent{ height: 320px; diff --git a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties index 3bd041cf05..bb54510f68 100644 --- a/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties +++ b/org.adempiere.server/src/main/home/org/bmlaurus/home/home.properties @@ -10,23 +10,23 @@ ResourceLink = http://www.idempiere.org IrcLink = http://webchat.freenode.net/?channels=idempiere WikiLink = http://wiki.idempiere.org/ ForumsLink = http://groups.google.com/group/idempiere -SupportRequestLink = http://jira.idempiere.com -SupportLink = mailto:idempiere@googlegroups.com -OptionLink = https://idempiere.atlassian.net +SupportRequestLink = https://idempiere.atlassian.net +SupportLink = https://mattermost.idempiere.org/idempiere/channels/support +OptionLink = https://github.com/idempiere/ #Default Texts -OptionText = Options +OptionText = Get Involved FelixText = Plug-In Console -iDempiereMonitorText= Idempiere Monitor -LocalSupportText = Local Support -WebUiText = WebUI App +iDempiereMonitorText= iDempiere Server Monitor +LocalSupportText = Online Support +WebUiText = Login WebStoreText = Web Store SendRequestText = Send Request -ResourceText = Resource +ResourceText = Community Resources IrcText = IRC Channel WikiText = Wiki -ForumsText = Forums -SupportRequestText = Support Request +ForumsText = Forum +SupportRequestText = Report a Bug #Social Networks. NONE to hide Facebook = https://www.facebook.com/IDempiere @@ -41,7 +41,7 @@ Social7 = NONE Title = iDempiere Application Home #Custom TemplateName (white or black) -TemplateName = black +TemplateName = white #file:///Linux/&Mac/resources/templates/ --- file://Windows/resources/templates/ TemplatePath = resources/templates/ @@ -49,8 +49,8 @@ TemplatePath = resources/templates/ CustomImagePath = NONE #Client Name & Logo file (format file://) -ClientName = iDempiere Server +ClientName = iDempiere Application Home #Custom Credits & Copyright tail -Credits = Welcome to the iDempiere (OSGi+ADempiere) 7.1 Page! +Credits = Welcome to iDempiere 7.1 Copyriright = || by iDempiere Community