svn commit: r764950 - in /ofbiz/trunk/themes/smoothfeat
Locked
 
|
Author: jonesde
Date: Tue Apr 14 20:58:54 2009 New Revision: 764950 URL: http://svn.apache.org/viewvc?rev=764950&view=rev Log: Applied patch from Rob based on work by Ryan Foster to clean up some issues in the smoothfeather theme as reported on the mailing list, patch from OFBIZ-2263 Modified: ofbiz/trunk/themes/smoothfeather/includes/appbar.ftl ofbiz/trunk/themes/smoothfeather/includes/footer.ftl ofbiz/trunk/themes/smoothfeather/includes/header.ftl ofbiz/trunk/themes/smoothfeather/includes/messages.ftl ofbiz/trunk/themes/smoothfeather/includes/secondary-appbar.ftl ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/base.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/calendar.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/forms.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/global.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/ie.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/links.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/login.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/nav.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/print.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/reset.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/tables.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/typography.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/views.css ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/js/global.js Modified: ofbiz/trunk/themes/smoothfeather/includes/appbar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/includes/appbar.ftl?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/includes/appbar.ftl (original) +++ ofbiz/trunk/themes/smoothfeather/includes/appbar.ftl Tue Apr 14 20:58:54 2009 @@ -1,3 +1,21 @@ +<#-- +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. +--> <#if (requestAttributes.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if> <#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if> <#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")> Modified: ofbiz/trunk/themes/smoothfeather/includes/footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/includes/footer.ftl?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/includes/footer.ftl (original) +++ ofbiz/trunk/themes/smoothfeather/includes/footer.ftl Tue Apr 14 20:58:54 2009 @@ -1,3 +1,21 @@ +<#-- +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. +--> <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content> <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript> <script type="text/javascript" src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script> Modified: ofbiz/trunk/themes/smoothfeather/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/includes/header.ftl?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/includes/header.ftl (original) +++ ofbiz/trunk/themes/smoothfeather/includes/header.ftl Tue Apr 14 20:58:54 2009 @@ -1,3 +1,21 @@ +<#-- +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. +--> <#if (requestAttributes.person)?exists><#assign person = requestAttributes.person></#if> <#if (requestAttributes.partyGroup)?exists><#assign partyGroup = requestAttributes.partyGroup></#if> <#assign docLangAttr = locale.toString()?replace("_", "-")> Modified: ofbiz/trunk/themes/smoothfeather/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/includes/messages.ftl?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/includes/messages.ftl (original) +++ ofbiz/trunk/themes/smoothfeather/includes/messages.ftl Tue Apr 14 20:58:54 2009 @@ -1,3 +1,21 @@ +<#-- +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. +--> <#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if> <#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if> <#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if> Modified: ofbiz/trunk/themes/smoothfeather/includes/secondary-appbar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/includes/secondary-appbar.ftl?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/includes/secondary-appbar.ftl (original) +++ ofbiz/trunk/themes/smoothfeather/includes/secondary-appbar.ftl Tue Apr 14 20:58:54 2009 @@ -1,3 +1,21 @@ +<#-- +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. +--> <#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()> <#if (requestAttributes.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if> Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/base.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/base.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/base.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/base.css Tue Apr 14 20:58:54 2009 @@ -1,12 +1,21 @@ -/***************************************************** - OFBiz Admin Base/Reset Styles - - author: Ryan Foster - company: Hotwax Media - url: - date: 02/26/200 - -*****************************************************/ +/* + * 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. + */ /************************* Global Reset Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/calendar.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/calendar.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/calendar.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/calendar.css Tue Apr 14 20:58:54 2009 @@ -1,3 +1,22 @@ +/* + * 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. + */ + .calendar { border-right: 0.1em solid #cccccc; } 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=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/forms.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/forms.css Tue Apr 14 20:58:54 2009 @@ -1,8 +1,26 @@ +/* + * 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. + */ + form { border: 0; margin: 0; text-align: left; - } form label { Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/global.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/global.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/global.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/global.css Tue Apr 14 20:58:54 2009 @@ -1,16 +1,27 @@ -/***************************************************** - OFBiz Admin Global Site Styles - - author: Ryan Foster - company: Hotwax Media - url: - date: 02/26/200 - -*****************************************************/ +/* + * 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. + */ + @import url("base.css"); @import url("views.css"); @import url("tables.css"); @import url("forms.css"); + /************************* General *************************/ Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/ie.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/ie.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/ie.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/ie.css Tue Apr 14 20:58:54 2009 @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* Make sure the layout is centered in IE5 */ body { text-align: center; } .container { text-align: left; } Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/links.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/links.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/links.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/links.css Tue Apr 14 20:58:54 2009 @@ -1,5 +1,28 @@ +/* + * 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. + */ + /* Use this class if a link gets an icon when it shouldn't. */ -body a.noicon { background:none; padding:0; margin:0; } +body a.noicon { + background:none; + padding:0; + margin:0; +} /* Make sure the icons are not cut */ a[href^="http:"], a[href^="mailto:"], a[href^="http:"]:visited, @@ -12,16 +35,35 @@ } /* External links */ -a[href^="http:"] { background-image: url(../images/icons/external.png); } -a[href^="mailto:"] { background-image: url(../images/icons/email.png); } -a[href^="http:"]:visited { background-image: url(../images/icons/visited.png); } +a[href^="http:"]{ + background-image: url(../images/icons/external.png); +} +a[href^="mailto:"]{ + background-image: url(../images/icons/email.png); +} +a[href^="http:"]:visited { + background-image: url(../images/icons/visited.png); +} /* Files */ -a[href$=".pdf"] { background-image: url(../images/icons/pdf.png); } -a[href$=".doc"] { background-image: url(../images/icons/doc.png); } -a[href$=".xls"] { background-image: url(../images/icons/xls.png); } +a[href$=".pdf"]{ + background-image: url(../images/icons/pdf.png); +} + +a[href$=".doc"]{ + background-image: url(../images/icons/doc.png); +} + +a[href$=".xls"]{ + background-image: url(../images/icons/xls.png); +} /* Misc */ a[href$=".rss"], -a[href$=".rdf"] { background-image: url(../images/icons/feed.png); } -a[href^="aim:"] { background-image: url(../images/icons/im.png); } +a[href$=".rdf"]{ + background-image: url(../images/icons/feed.png); +} + +a[href^="aim:"]{ + background-image: url(../images/icons/im.png); +} Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/login.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/login.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/login.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/login.css Tue Apr 14 20:58:54 2009 @@ -1,12 +1,21 @@ -/***************************************************** - OFBiz Admin Login Style - - author: Ryan Foster - company: Hotwax Media - url: - date: 02/26/200 - -*****************************************************/ +/* + * 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. + */ @import url("base.css"); @import url("tables.css"); Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/nav.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/nav.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/nav.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/nav.css Tue Apr 14 20:58:54 2009 @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* BASIC NAVIGATION (VERTICAL MENU) STYLE */ .basic-nav { /* indent menu - helpful for widgets */ padding-left: 1em; @@ -607,7 +626,6 @@ line-height: 16px; background-color: #172322; color: #0395CC; /* for IE */ - z-index:6000; } Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/print.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/print.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/print.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/print.css Tue Apr 14 20:58:54 2009 @@ -1,29 +1,100 @@ -/* ----------------------------------------------------------------------- +/* + * 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. + */ - Blueprint CSS Framework 0.7 (Date TBD) - http://blueprintcss.googlecode.com +body { + line-height:1.5; + font-family:"Helvetica Neue", Helvetica, Arial, sans-serif; + color:#000; + background:none; + font-size:10pt; +} - * Copyright (c) Olav Bjorkoy 2007 - 2008. See docs/license.txt for more info. - * See docs/readme.txt for instructions on how to use Blueprint. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* print.css */ -body {line-height:1.5;font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;color:#000;background:none;font-size:10pt;} -.container {background:none;} -hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;} -hr.space {background:#fff;color:#fff;} -h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;} -code {font:.9em "Courier New", Monaco, Courier, monospace;} -img {float:left;margin:1.5em 1.5em 1.5em 0;} -a img {border:none;} -p img.top {margin-top:0;} -blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;} -.small {font-size:.9em;} -.large {font-size:1.1em;} -.quiet {color:#999;} -.hide {display:none;} -a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;} -a:link:after, a:visited:after {content:" (" attr(href) ") ";font-size:90%;} +.container { + background:none; +} +hr { + background:#ccc; + color:#ccc; + width:100%; + height:2px; + margin:2em 0; + padding:0; + border:none; +} + +hr.space { + background:#fff; + color:#fff; +} + +h1, h2, h3, h4, h5, h6 { + font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif; +} + +code { + font:.9em "Courier New", Monaco, Courier, monospace; +} + +img { + float:left; + margin:1.5em 1.5em 1.5em 0; +} + +a img { + border:none; +} + +p img.top { + margin-top:0; +} + +blockquote { + margin:1.5em; + padding:1em; + font-style:italic; + font-size:.9em; +} + +.small { + font-size:.9em; +} + +.large { + font-size:1.1em; +} + +.quiet { + color:#999; +} + +.hide { + display:none; +} + +a:link, a:visited { + background:transparent; + font-weight:700; + text-decoration:underline; +} + +a:link:after, a:visited:after { + content:" (" attr(href) ") "; + font-size:90%; +} \ No newline at end of file Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/reset.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/reset.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/reset.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/reset.css Tue Apr 14 20:58:54 2009 @@ -1,3 +1,22 @@ +/* + * 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. + */ + html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td { margin: 0; Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/tables.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/tables.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/tables.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/tables.css Tue Apr 14 20:58:54 2009 @@ -1,6 +1,24 @@ +/* + * 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. + */ + table { width: 99%; - } table tr td { @@ -43,7 +61,8 @@ width: 100%; } -form .basic-table,.screenlet-body .basic-table { +form .basic-table, +.screenlet-body .basic-table { margin-bottom: 0; } @@ -51,7 +70,8 @@ padding: 0.1em; } -.basic-table tr .label,.basic-table tr .group-label { +.basic-table tr .label, +.basic-table tr .group-label { /* field labels for forms */ font-weight: bold; text-align: right; @@ -65,7 +85,8 @@ padding: 2em 1.5em 0 0; } -.basic-table tr th,.basic-table .header-row { +.basic-table tr th, +.basic-table .header-row { font-weight: bold; text-align: left; } @@ -107,8 +128,7 @@ background: #FC7455; } -.basic-table tr .button-col { /* button column style - for the small -collection of buttons used in lists */ +.basic-table tr .button-col { /* button column style - for the small collection of buttons used in lists */ vertical-align: top; } @@ -121,7 +141,8 @@ white-space: nowrap; } -.basic-table tr .smallSubmit,.basic-table tr .smallSubmit:visited { +.basic-table tr .smallSubmit, +.basic-table tr .smallSubmit:visited { background-color: #ffffff; color: #444; font-size: 1em; @@ -131,7 +152,10 @@ white-space: nowrap; } -.basic-table tr .button-col a:hover,.basic-table tr .button-col a:active,.basic-table tr .smallSubmit:hover,.basic-table tr .smallSubmit:active +.basic-table tr .button-col a:hover, +.basic-table tr .button-col a:active, +.basic-table tr .smallSubmit:hover, +.basic-table tr .smallSubmit:active { color: #ff0000; text-decoration: none; @@ -141,26 +165,30 @@ visibility: collapse; } -.basic-table .header-row-2 th,.basic-table .header-row-2 td { +.basic-table .header-row-2 th, +.basic-table .header-row-2 td { background-color: #999999; color: #ffffff; font-weight: bold; text-align: left; } -.basic-table .header-row-2 th .sort-order-asc,.basic-table .header-row-2 td .sort-order-asc +.basic-table .header-row-2 th .sort-order-asc, +.basic-table .header-row-2 td .sort-order-asc { background: url(/images/arrow-gr-up.png) no-repeat right; padding-right: 20px; } -.basic-table .header-row-2 th .sort-order-desc,.basic-table .header-row-2 td .sort-order-desc +.basic-table .header-row-2 th .sort-order-desc, +.basic-table .header-row-2 td .sort-order-desc { background: url(/images/arrow-gr-dw.png) no-repeat right; padding-right: 20px; } -.basic-table .header-row-2 th .sort-order,.basic-table .header-row-2 td .sort-order +.basic-table .header-row-2 th .sort-order, +.basic-table .header-row-2 td .sort-order { background: url(/images/arrow-gr.png) no-repeat right; padding-right: 20px; Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/typography.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/typography.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/typography.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/typography.css Tue Apr 14 20:58:54 2009 @@ -1,3 +1,22 @@ +/* + * 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. + */ + html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/views.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/views.css?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/views.css (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/css/views.css Tue Apr 14 20:58:54 2009 @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* SCREENLETS */ .screenlet-header { height : auto !important; @@ -5,7 +24,6 @@ padding: 5px; height: auto !important; text-transform:uppercase; - } .boxhead { @@ -25,8 +43,6 @@ height: 1%; /* IE fix */ min-height: 1.5em; height:20px; - - } .screenlet-title-bar .h1, @@ -52,14 +68,16 @@ padding: 0.1em 0.5em 0.2em 0.5em; } -.screenlet-title-bar ul h1,.screenlet-title-bar ul h2,.screenlet-title-bar ul h3,.screenlet-title-bar ul .h1,.screenlet-title-bar ul .h2,.screenlet-title-bar ul .h3 - { +.screenlet-title-bar ul h1, +.screenlet-title-bar ul h2, +.screenlet-title-bar ul h3, +.screenlet-title-bar ul .h1, +.screenlet-title-bar ul .h2, +.screenlet-title-bar ul .h3 { border-left: none; float: left; } - - .screenlet-title-bar ul a { color: #69a2c8; display: block; @@ -82,27 +100,28 @@ color: #CCCCCC; } -.screenlet-title-bar ul .collapsed,.screenlet-title-bar ul .collapsed:hover - { +.screenlet-title-bar ul .collapsed, +.screenlet-title-bar ul .collapsed:hover { background: url(/images/expand.gif) no-repeat center center; min-height: 1.1em; min-width: 1.1em; } -.screenlet-title-bar ul .expanded,.screenlet-title-bar ul .expanded:hover - { +.screenlet-title-bar ul .expanded, +.screenlet-title-bar ul .expanded:hover { background: url(/images/collapse.gif) no-repeat center center; min-height: 1.1em; min-width: 1.1em; } -.screenlet-title-bar ul .collapsed a,.screenlet-title-bar ul .expanded a - { /* IE fix */ +.screenlet-title-bar ul .collapsed a, +.screenlet-title-bar ul .expanded a { /* IE fix */ cursor: default; } -.screenlet-title-bar ul .h1:hover,.screenlet-title-bar ul .h2:hover,.screenlet-title-bar ul .h3:hover - { +.screenlet-title-bar ul .h1:hover, +.screenlet-title-bar ul .h2:hover, +.screenlet-title-bar ul .h3:hover { } @@ -117,7 +136,6 @@ } /* COLUMNS */ - #content-main-section .h1 { font-size:22px; text-transform:uppercase; @@ -175,15 +193,15 @@ padding: 0.1em 0.5em 0.2em 0.5em; } -.fieldgroup-title-bar ul .collapsed,.fieldgroup-title-bar ul .collapsed:hover - { +.fieldgroup-title-bar ul .collapsed, +.fieldgroup-title-bar ul .collapsed:hover { background: url(/images/expand.gif) no-repeat center center; min-height: 1.1em; min-width: 1.1em; } -.fieldgroup-title-bar ul .expanded,.fieldgroup-title-bar ul .expanded:hover - { +.fieldgroup-title-bar ul .expanded, +.fieldgroup-title-bar ul .expanded:hover { background: url(/images/collapse.gif) no-repeat center center; min-height: 1.1em; min-width: 1.1em; @@ -218,23 +236,19 @@ } .portlet-config-title-bar ul li.move-up { - background: url(/images/arrow-single-up-green.png) no-repeat center - center; + background: url(/images/arrow-single-up-green.png) no-repeat center center; } .portlet-config-title-bar ul li.move-down { - background: url(/images/arrow-single-down-green.png) no-repeat center - center; + background: url(/images/arrow-single-down-green.png) no-repeat center center; } .portlet-config-title-bar ul li.move-left { - background: url(/images/arrow-single-left-green.png) no-repeat center - center; + background: url(/images/arrow-single-left-green.png) no-repeat center center; } .portlet-config-title-bar ul li.move-right { - background: url(/images/arrow-single-right-green.png) no-repeat center - center; + background: url(/images/arrow-single-right-green.png) no-repeat center center; } .portlet-config-title-bar ul li.move-top { @@ -242,8 +256,7 @@ } .portlet-config-title-bar ul li.move-bottom { - background: url(/images/arrow-end-down-green.png) no-repeat center - center; + background: url(/images/arrow-end-down-green.png) no-repeat center center; } .portlet-config-title-bar ul li.remove { @@ -265,8 +278,9 @@ padding: 0.1em 0.5em 0.2em 0.5em; } -#manage-portal-toolbar #config-on-off,#manage-portal-toolbar #manage-portal-page,#manage-portal-toolbar #add-portlet - { +#manage-portal-toolbar #config-on-off, +#manage-portal-toolbar #manage-portal-page, +#manage-portal-toolbar #add-portlet { float: right; } Modified: ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/js/global.js URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/js/global.js?rev=764950&r1=764949&r2=764950&view=diff ============================================================================== --- ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/js/global.js (original) +++ ofbiz/trunk/themes/smoothfeather/webapp/smoothfeather/js/global.js Tue Apr 14 20:58:54 2009 @@ -1,8 +1,26 @@ +/* + * 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. + */ //GLOBAL NAMESPACE -var HOTWAX = window.HOTWAX || {}; +var OFBIZ = window.OFBIZ || {}; //SUBNAV HEADING -HOTWAX.buildSubnav = function(){ +OFBIZ.buildSubnav = function(){ if($$('.tab-bar')){ $$('.tab-bar').each(function(elm) { $(elm).insert( { @@ -15,28 +33,28 @@ bottom :"<div><a href='#' class='close-tab'>close</a></div>" }); }); - //HOTWAX.initExpansion(); + //OFBIZ.initExpansion(); } } /* Round 2 - Sliding Left Bar - Coming Soon //QUICK NAV/SEARCH FOR LEFT SCREENLET -HOTWAX.buildSearch = function(){ +OFBIZ.buildSearch = function(){ if($$('.left')){ $$('.left').each(function(elm) { $(elm).insert( { before :"<div id='sideBar'>" }); $(elm).insert( { - after :"<a href='#' id='sideBarTab'><img src='/admin/images/slide-button-left.gif' alt='sideBar' title='sideBar' /></a></div>" + after :"<a href='#' id='sideBarTab'><img src='/smoothfeather/images/slide-button-left.gif' alt='sideBar' title='sideBar' /></a></div>" }); }); - //HOTWAX.initExpansion(); + //OFBIZ.initExpansion(); } } var isExtended = 0; -HOTWAX.slideSideBar = function(){ +OFBIZ.slideSideBar = function(){ new Effect.toggle('sideBarContents', 'blind', {scaleX: 'true', scaleY: 'true;', scaleContent: false}); if(isExtended==0){ $('sideBarTab').childNodes[0].src = $('sideBarTab').childNodes[0].src.replace(/(\.[^.]+)$/, '-active$1'); @@ -50,15 +68,15 @@ } } -HOTWAX.initSideBar = function(){ - Event.observe('sideBarTab', 'click', HOTWAX.slideSideBar, true); +OFBIZ.initSideBar = function(){ + Event.observe('sideBarTab', 'click', OFBIZ.slideSideBar, true); } -Event.observe(window, 'load', HOTWAX.initSideBar, true); +Event.observe(window, 'load', OFBIZ.initSideBar, true); */ //GLOBAL FUNCTION FOR APP DROP-DROWN SECTIONS -HOTWAX.initExpansion = function() { +OFBIZ.initExpansion = function() { if($$('.contracted')){ $$('.contracted').each(function(elm) { $(elm).next().style.display = 'none'; @@ -73,11 +91,11 @@ if($(elm).next().visible()) { $(elm).removeClassName('contracted'); $(elm).addClassName('expanded'); - HOTWAX.Cookie.set($(elm).next().id,'expanded',360); + OFBIZ.Cookie.set($(elm).next().id,'expanded',360); } else { $(elm).removeClassName('expanded'); $(elm).addClassName('contracted'); - HOTWAX.Cookie.set($(elm).next().id,'contracted',360); + OFBIZ.Cookie.set($(elm).next().id,'contracted',360); } } }); @@ -86,7 +104,7 @@ } } -HOTWAX.Cookie = { +OFBIZ.Cookie = { set: function(name, value, daysToExpire) { var expire = ''; if (daysToExpire != undefined) { @@ -101,20 +119,20 @@ return (cookie ? unescape(cookie[2]) : null); }, erase: function(name) { - var cookie = HOTWAX.Cookie.get(name) || true; - HOTWAX.Cookie.set(name, '', -1); + var cookie = OFBIZ.Cookie.get(name) || true; + OFBIZ.Cookie.set(name, '', -1); return cookie; }, accept: function() { if (typeof navigator.cookieEnabled == 'boolean') { return navigator.cookieEnabled; } - HOTWAX.Cookie.set('_test', '1'); - return (HOTWAX.Cookie.erase('_test') === '1'); + OFBIZ.Cookie.set('_test', '1'); + return (OFBIZ.Cookie.erase('_test') === '1'); } } -HOTWAX.Effect = Object.extend({}, Effect); +OFBIZ.Effect = Object.extend({}, Effect); Object.extend(Element,{ findElement: function(element, tagName) { var element = $(element); @@ -213,9 +231,9 @@ //LOAD GLOBAL APP FUNCTIONS document.observe('dom:loaded', function(){ - HOTWAX.initExpansion(); - HOTWAX.buildSubnav(); - HOTWAX.buildSearch(); + OFBIZ.initExpansion(); + OFBIZ.buildSubnav(); + OFBIZ.buildSearch(); humanMsg.setup(); }); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |