Author: adrianc
Date: Sun Jul 27 06:45:04 2008
New Revision: 680104
URL: http://svn.apache.org/viewvc?rev=680104&view=rev
Log:
Style sheet cleanups.
Modified:
ofbiz/trunk/framework/images/webapp/images/maincss.css
ofbiz/trunk/framework/images/webapp/images/mainrtl.css
ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl
Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?rev=680104&r1=680103&r2=680104&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Sun Jul 27 06:45:04
2008
@@ -73,6 +73,13 @@
position: relative;
}
+hr {
+background-color: #999999;
+border: 0;
+height: 0.1em;
+margin: 0.5em 0 0.5em 0;
+}
+
input[type="radio"], input[type="checkbox"] {
font-size: 1.1em;
margin: 0.2em;
@@ -426,60 +433,6 @@
border: 0.1em solid #999999;
}
-.headerButtonLeft {
-background-color: #B4B0AA;
-color: #000099;
-font-weight: bold;
-border-right: solid #ffffff 0.1em;
-padding-right: 1em;
-padding-left: 1em;
-}
-
-.headerButtonLeft:hover {
-background-color: #D4D0C8;
-color: #000000;
-}
-
-.headerButtonLeftSelected {
-background-color: #D4D0C8;
-border-right: solid #ffffff 0.1em;
-color: #000099;
-font-weight: bold;
-padding-right: 1em;
-padding-left: 1em;
-}
-
-.headerButtonRight {
-background-color: #B4B0AA;
-border-left: solid #ffffff 0.1em;
-color: #000099;
-font-weight: bold;
-padding-right: 1em;
-padding-left: 1em;
-text-align: right;
-}
-
-.headerButtonRight:hover {
-background-color: #D4D0C8;
-color: #000000;
-}
-
-.headerButtonRightSelected {
-background-color: #D4D0C8;
-border-left: solid #ffffff 0.1em;
-color: #000099;
-font-weight: bold;
-padding-right: 1em;
-padding-left: 1em;
-}
-
-hr {
-background-color: #999999;
-border: 0;
-height: 0.1em;
-margin: 0.5em 0 0.5em 0;
-}
-
.eventMessage, .errorMessage {
background-color: #FFFFEE;
border: solid #000000 0.1em;
@@ -1220,11 +1173,6 @@
background-image: url(/images/gradient_sub_uns.gif);
}
-.screenlet-title-bar .head4:hover {
-background-color: #000099;
-background-image: url(/images/gradient_sub_uns.gif);
-}
-
/* login screenlet decorator */
.login-screenlet {
min-width: 25em;
Modified: ofbiz/trunk/framework/images/webapp/images/mainrtl.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/mainrtl.css?rev=680104&r1=680103&r2=680104&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/mainrtl.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/mainrtl.css Sun Jul 27 06:45:04
2008
@@ -28,10 +28,6 @@
/* ===== Legacy Styles ===== */
-.tabletextright {
-text-align: left;
-}
-
.boxlink {
float: left;
}
@@ -63,27 +59,6 @@
padding-right: 0.2em;
}
-.headerButtonLeft, .headerButtonLeftSelected {
-border-right: none;
-border-left: solid #ffffff 0.1em;
-}
-
-.headerButtonRight {
-border-left: none;
-border-right: solid #ffffff 0.1em;
-text-align: left;
-}
-
-.headerButtonRight:hover {
-background-color: #D4D0C8;
-color: #000000;
-}
-
-.headerButtonRightSelected {
-border-left: none;
-border-right: solid #ffffff 0.1em;
-}
-
/* ===== Product Summary Styles ===== */
.product-prevnext {
text-align: left;
Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl?rev=680104&r1=680103&r2=680104&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl
(original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/includes/appheader.ftl Sun
Jul 27 06:45:04 2008
@@ -16,20 +16,16 @@
specific language governing permissions and limitations
under the License.
-->
-<#assign security = requestAttributes.security>
-<#assign unselectedLeftClassName = "headerButtonLeft">
-<#assign unselectedRightClassName = "headerButtonRight">
-<#assign selectedLeftClassMap = {page.headerItem?default("void") :
"headerButtonLeftSelected"}>
-<#assign selectedRightClassMap = {page.headerItem?default("void") :
"headerButtonRightSelected"}>
-<#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap =
requestAttributes.uiLabelMap></#if>
-
-<div class="apptitle"> ${uiLabelMap.FrameworkShark} </div>
-<div class="row">
- <div class="col"><a href="<@ofbizUrl>main</@ofbizUrl>"
class="${selectedLeftClassMap.main?default(unselectedLeftClassName)}">${uiLabelMap.CommonMain}</a></div>
- <#if requestAttributes.userLogin?has_content>
- <div class="opposed"><a href="<@ofbizUrl>logout</@ofbizUrl>"
class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
- <#else>
- <div class="opposed"><a
href='<@ofbizUrl>${requestAttributes.checkLoginUrl?if_exists}</@ofbizUrl>'
class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div>
- </#if>
- <div class="col-fill"> </div>
-</div>
+<#assign selected = headerItem?default("void")>
+<div id="app-navigation">
+ <h2>${uiLabelMap.FrameworkShark}</h2>
+ <ul>
+ <#if userLogin?has_content>
+ <li<#if selected == "main"> class="selected"</#if>><a
href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.WorkEffortTaskList}</a></li>
+ <li class="opposed"><a
href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
+ <#else>
+ <li class="opposed"><a
href="<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
+ </#if>
+ </ul>
+ <br class="clear"/>
+</div>
