You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2009/04/17 08:29:10 UTC
svn commit: r765862 - in /ofbiz/trunk: framework/common/config/
framework/common/data/ framework/common/webcommon/includes/
framework/common/widget/ framework/images/webapp/images/ themes/flatgrey/
themes/flatgrey/data/ themes/flatgrey/includes/ themes...
Author: jonesde
Date: Fri Apr 17 06:29:09 2009
New Revision: 765862
URL: http://svn.apache.org/viewvc?rev=765862&view=rev
Log:
Moved old default theme data and files to new flatgrey theme; small corrections for use of messages.ftl; added setting in general.properties for the default theme ID; changed default theme to smoothfeather
Added:
ofbiz/trunk/themes/flatgrey/
ofbiz/trunk/themes/flatgrey/data/
ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (with props)
ofbiz/trunk/themes/flatgrey/includes/
ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
- copied unchanged from r765844, ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl
ofbiz/trunk/themes/flatgrey/includes/footer.ftl
- copied, changed from r765844, ofbiz/trunk/framework/common/webcommon/includes/footer.ftl
ofbiz/trunk/themes/flatgrey/includes/header.ftl
- copied unchanged from r765844, ofbiz/trunk/framework/common/webcommon/includes/header.ftl
ofbiz/trunk/themes/flatgrey/ofbiz-component.xml (with props)
ofbiz/trunk/themes/flatgrey/webapp/
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml (with props)
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
- copied unchanged from r765844, ofbiz/trunk/framework/images/webapp/images/maincss.css
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/mainrtl.css
- copied unchanged from r765844, ofbiz/trunk/framework/images/webapp/images/mainrtl.css
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/ofbiz.ico
- copied unchanged from r765844, ofbiz/trunk/framework/images/webapp/images/ofbiz.ico
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/ofbiz_logo.jpg
- copied unchanged from r765844, ofbiz/trunk/framework/images/webapp/images/ofbiz_logo.jpg
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/screenshot.gif
- copied unchanged from r765844, ofbiz/trunk/framework/images/webapp/images/default-screenshot.gif
Removed:
ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl
ofbiz/trunk/framework/common/webcommon/includes/footer.ftl
ofbiz/trunk/framework/common/webcommon/includes/header.ftl
ofbiz/trunk/framework/images/webapp/images/default-screenshot.gif
ofbiz/trunk/framework/images/webapp/images/maincss.css
ofbiz/trunk/framework/images/webapp/images/mainrtl.css
ofbiz/trunk/framework/images/webapp/images/ofbiz.ico
ofbiz/trunk/framework/images/webapp/images/ofbiz_logo.jpg
Modified:
ofbiz/trunk/framework/common/config/general.properties
ofbiz/trunk/framework/common/data/CommonTypeData.xml
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/WEB-INF/web.xml
ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/forms.css
Modified: ofbiz/trunk/framework/common/config/general.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=765862&r1=765861&r2=765862&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/general.properties (original)
+++ ofbiz/trunk/framework/common/config/general.properties Fri Apr 17 06:29:09 2009
@@ -26,6 +26,9 @@
# -- the default organizationPartyId for used in dropdowns and reports
defaultOrganizationPartyId=Company
+# ID of the VisualTheme to use if there VISUAL_THEME UserPreference record for the current user
+defaultVisualThemeId=SMOOTH_FEATHER
+
# -- the default decimal format for currency
currency.decimal.format=##0.00
Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=765862&r1=765861&r2=765862&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
+++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Fri Apr 17 06:29:09 2009
@@ -101,7 +101,7 @@
<!-- User preferences seed data -->
<UserPrefGroupType userPrefGroupTypeId="GLOBAL_PREFERENCES" description="Global preferences"/>
- <UserPreference userLoginId="_NA_" userPrefTypeId="VISUAL_THEME" userPrefGroupTypeId="GLOBAL_PREFERENCES" userPrefValue="DEFAULT"/>
+ <UserPreference userLoginId="_NA_" userPrefTypeId="VISUAL_THEME" userPrefGroupTypeId="GLOBAL_PREFERENCES" userPrefValue="SMOOTH_FEATHER"/>
<!-- Visual Themes seed data -->
<EnumerationType description="Visual Theme Resource Type (stylesheet, javascript file, etc)" enumTypeId="VT_RES_TYPE" hasTable="N"/>
@@ -121,22 +121,10 @@
<VisualThemeSet visualThemeSetId="BACKOFFICE" description="Themes to be used for backoffice applications"/>
<VisualThemeSet visualThemeSetId="ECOMMERCE" description="Themes to be used for ECommerce applications"/>
- <VisualTheme visualThemeId="DEFAULT" visualThemeSetId="BACKOFFICE" description="OFBiz Standard Floating Layout"/>
- <VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/maincss.css" sequenceId="01"/>
- <VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/images/mainrtl.css" sequenceId="01"/>
- <VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
- <VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.jpg" sequenceId="01"/>
- <VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://common/webcommon/includes/header.ftl" sequenceId="01"/>
- <VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://common/webcommon/includes/footer.ftl" sequenceId="01"/>
- <VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://common/webcommon/includes/appbar.ftl" sequenceId="01"/>
- <VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/>
- <VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/images/default-screenshot.gif" sequenceId="01"/>
-
<WebSite webSiteId="WEBTOOLS" siteName="Web Tools" visualThemeSetId="BACKOFFICE"/>
<!-- Uom Conversion Purposes -->
<EnumerationType enumTypeId="CONVERSION_PURPOSE" description="Conversion Purpose"/>
<Enumeration enumId="INTERNAL_CONVERSION" enumTypeId="CONVERSION_PURPOSE" enumCode="INTERNAL" sequenceId="10" description="Internal Conversion"/>
<Enumeration enumId="EXTERNAL_CONVERSION" enumTypeId="CONVERSION_PURPOSE" enumCode="EXTERNAL" sequenceId="20" description="External Conversion"/>
-
</entity-engine-xml>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=765862&r1=765861&r2=765862&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri Apr 17 06:29:09 2009
@@ -125,7 +125,10 @@
<field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
</service>
<set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/>
- <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="DEFAULT" global="true"/>
+
+ <property-map resource="general" map-name="generalProperties" global="true"/>
+ <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="SMOOTH_FEATHER"/>
+ <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
<field-map field-name="themeResources" from-field="layoutSettings"/>
@@ -211,16 +214,20 @@
<field-map field-name="userPrefGroupTypeId" value="GLOBAL_PREFERENCES"/>
</service>
<set field="userPreferences" from-field="prefResult.userPrefMap" global="true"/>
- <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="DEFAULT" global="true"/>
+
+ <property-map resource="general" map-name="generalProperties" global="true"/>
+ <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="SMOOTH_FEATHER"/>
+ <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
<field-map field-name="themeResources" from-field="layoutSettings"/>
</service>
<set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
+ <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" default-value="component://common/webcommon/includes/messages.ftl"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://common/webcommon/includes/lookup.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific>
<section>
<condition>
<not><if-empty field="sections.body"/></not>
Added: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=765862&view=auto
==============================================================================
--- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (added)
+++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Fri Apr 17 06:29:09 2009
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<entity-engine-xml>
+ <VisualTheme visualThemeId="FLAT_GREY" visualThemeSetId="BACKOFFICE" description="Flat Grey - Old OFBiz Standard Floating Layout"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/maincss.css" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/mainrtl.css" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/flatgrey/ofbiz.ico" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/flatgrey/ofbiz_logo.jpg" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://flatgrey/includes/header.ftl" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common/webcommon/includes/messages.ftl" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/includes/footer.ftl" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/includes/appbar.ftl" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/flatgrey/screenshot.gif" sequenceId="01"/>
+</entity-engine-xml>
Propchange: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: ofbiz/trunk/themes/flatgrey/includes/footer.ftl (from r765844, ofbiz/trunk/framework/common/webcommon/includes/footer.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/footer.ftl?p2=ofbiz/trunk/themes/flatgrey/includes/footer.ftl&p1=ofbiz/trunk/framework/common/webcommon/includes/footer.ftl&r1=765844&r2=765862&rev=765862&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/footer.ftl Fri Apr 17 06:29:09 2009
@@ -62,7 +62,7 @@
<a href="http://validator.w3.org/check?uri=referer"><img src="<@o...@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p>
<p>
${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br />
- ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "../../../../runtime/svninfo.ftl" /></p>
+ ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "../../../runtime/svninfo.ftl" /></p>
</div>
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
Added: ofbiz/trunk/themes/flatgrey/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/ofbiz-component.xml?rev=765862&view=auto
==============================================================================
--- ofbiz/trunk/themes/flatgrey/ofbiz-component.xml (added)
+++ ofbiz/trunk/themes/flatgrey/ofbiz-component.xml Fri Apr 17 06:29:09 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<ofbiz-component name="flatgrey"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
+ <!-- define resource loaders; most common is to use the component resource loader -->
+ <resource-loader name="main" type="component"/>
+
+ <!-- entity resources: model(s), eca(s), group, and data definitions -->
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/FlatGreyThemeData.xml"/>
+
+ <!-- web applications; will be mounted when using the embedded Jetty container -->
+ <webapp name="flatgrey"
+ title="flatgrey"
+ menu-name="secondary"
+ server="default-server"
+ location="webapp/flatgrey"
+ mount-point="/flatgrey"
+ app-bar-display="false"/>
+</ofbiz-component>
Propchange: ofbiz/trunk/themes/flatgrey/ofbiz-component.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/themes/flatgrey/ofbiz-component.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: ofbiz/trunk/themes/flatgrey/ofbiz-component.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/themes/flatgrey/ofbiz-component.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml?rev=765862&view=auto
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml (added)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml Fri Apr 17 06:29:09 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+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.
+-->
+
+<web-app>
+ <display-name>Open For Business - Flat Grey Visual Theme</display-name>
+ <description>Flat Grey Visual Theme</description>
+
+ <session-config>
+ <session-timeout>1</session-timeout>
+ </session-config>
+
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>main.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/WEB-INF/web.xml?rev=765862&r1=765861&r2=765862&view=diff
==============================================================================
--- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/WEB-INF/web.xml (original)
+++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/WEB-INF/web.xml Fri Apr 17 06:29:09 2009
@@ -20,16 +20,15 @@
-->
<web-app>
- <display-name>Open For Business - Hotwax Visual Theme</display-name>
- <description>Hotwax Visual Theme</description>
-
- <session-config>
- <session-timeout>1</session-timeout>
- </session-config>
-
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>main.jsp</welcome-file>
- </welcome-file-list>
-
+ <display-name>Open For Business - Smooth Feather Visual Theme</display-name>
+ <description>Smooth Feather Visual Theme</description>
+
+ <session-config>
+ <session-timeout>1</session-timeout>
+ </session-config>
+
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>main.jsp</welcome-file>
+ </welcome-file-list>
</web-app>
Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/forms.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/forms.css?rev=765862&r1=765861&r2=765862&view=diff
==============================================================================
--- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/forms.css (original)
+++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/forms.css Fri Apr 17 06:29:09 2009
@@ -75,7 +75,7 @@
input[type="submit"],input[type="button"],input[type="reset"] {
background-color: #ffffff;
border: #ddd solid 2px;
- color: #444;
+ color: #444444;
font-weight:bold;
line-height:1.8em;
margin:5px 5px 2px 5px;