[Fmsystem-commits] [14361] add themes

[Sigurd Nes]

Revision: 14361
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14361
Author:   sigurdne
Date:     2015-11-16 09:08:26 +0000 (Mon, 16 Nov 2015)
Log Message:
-----------
add themes

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/inc/class.common.inc.php
    branches/dev-syncromind/phpgwapi/js/jquery/tabs/css/style.css
    branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
    branches/dev-syncromind/phpgwapi/templates/pure/head.tpl

Added Paths:
-----------
    branches/dev-syncromind/phpgwapi/templates/pure/themes/
    branches/dev-syncromind/phpgwapi/templates/pure/themes/blue.css
    branches/dev-syncromind/phpgwapi/templates/pure/themes/grey.css

Modified: branches/dev-syncromind/phpgwapi/inc/class.common.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.common.inc.php   2015-11-15 
21:50:53 UTC (rev 14360)
+++ branches/dev-syncromind/phpgwapi/inc/class.common.inc.php   2015-11-16 
09:08:26 UTC (rev 14361)
@@ -596,7 +596,7 @@
                {
                        $tpl_dir = self::get_tpl_dir('phpgwapi');
 
-                       $css_dir = "$tpl_dir/css";
+                       $css_dir = "$tpl_dir/themes";
 
                        $list = array();
                        if ( !is_dir($css_dir) )

Modified: branches/dev-syncromind/phpgwapi/js/jquery/tabs/css/style.css
===================================================================
--- branches/dev-syncromind/phpgwapi/js/jquery/tabs/css/style.css       
2015-11-15 21:50:53 UTC (rev 14360)
+++ branches/dev-syncromind/phpgwapi/js/jquery/tabs/css/style.css       
2015-11-16 09:08:26 UTC (rev 14361)
@@ -9,12 +9,12 @@
 .r-tabs {
        position: relative;
 
-       background-color: #00c5ad;
+       background-color: #3968c6;
 
-       border-top: 1px solid #00c5ad;
-       border-right: 1px solid #00c5ad;
-       border-left: 1px solid #00c5ad;
-       border-bottom: 4px solid #00c5ad;
+       border-top: 1px solid #3968c6;
+       border-right: 1px solid #3968c6;
+       border-left: 1px solid #3968c6;
+       border-bottom: 4px solid #3968c6;
        border-radius: 4px;
 
 }
@@ -22,7 +22,7 @@
 /* Tab element */
 .r-tabs .r-tabs-nav .r-tabs-tab {
        position: relative;
-       background-color: #00c5ad;
+       background-color: #3968c6;
 }
 
 /* Tab anchor */
@@ -44,7 +44,7 @@
 
 /* Active state tab anchor */
 .r-tabs .r-tabs-nav .r-tabs-state-active .r-tabs-anchor {
-       color: #00c5ad;
+       color: #3968c6;
        text-shadow: none;
 
        background-color: white;
@@ -69,7 +69,7 @@
        display: block;
        padding: 10px;
 
-       background-color: #00c5ad;
+       background-color: #3968c6;
        color: #fff;
        font-weight: bold;
        text-decoration: none;
@@ -83,7 +83,7 @@
 /* Active accordion anchor */
 .r-tabs .r-tabs-accordion-title.r-tabs-state-active .r-tabs-anchor {
        background-color: #fff;
-       color: #00c5ad;
+       color: #3968c6;
        text-shadow: none;
 }
 
@@ -111,7 +111,7 @@
        -webkit-border-radius: 3px;
        -moz-border-radius: 3px;
        border-radius: 3px;
-       background-color: #00c5ad;
+       background-color: #3968c6;
        box-shadow: 0px 3px 0px 0px #00ab94;
        
        cursor: pointer;
@@ -128,7 +128,7 @@
 
        font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
        font-size: 14px;
-       color: #00c5ad;
+       color: #3968c6;
        border: 2px solid #00ab94;
        -webkit-border-radius: 3px;
        -moz-border-radius: 3px;

Modified: branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php        
2015-11-15 21:50:53 UTC (rev 14360)
+++ branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php        
2015-11-16 09:08:26 UTC (rev 14361)
@@ -63,20 +63,15 @@
 
        
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
        {
-               $stylesheets[] = 
"/phpgwapi/templates/pure/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+               $stylesheets[] = 
"/phpgwapi/templates/pure/themes/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
        }
        //$stylesheets[] = "/{$app}/templates/base/css/base.css";
        //$stylesheets[] = "/{$app}/templates/portico/css/base.css";
        
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
        {
-               $stylesheets[] = 
"/{$app}/templates/portico/css/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
+               $stylesheets[] = 
"/{$app}/templates/pure/themes/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
        }
-/*
-       
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['yui_table_nowrap'])
 && $GLOBALS['phpgw_info']['user']['preferences']['common']['yui_table_nowrap'])
-       {
-               $stylesheets[] = 
"/phpgwapi/templates/base/css/yui_table_nowrap.css";
-       }
-*/
+
        foreach ( $stylesheets as $stylesheet )
        {
                if( file_exists( PHPGW_SERVER_ROOT . $stylesheet ) )

Modified: branches/dev-syncromind/phpgwapi/templates/pure/head.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/head.tpl    2015-11-15 
21:50:53 UTC (rev 14360)
+++ branches/dev-syncromind/phpgwapi/templates/pure/head.tpl    2015-11-16 
09:08:26 UTC (rev 14361)
@@ -15,7 +15,7 @@
                                alert('{browser_not_supported}');
                        }
                </script>
-
+               {css}
                <!-- BEGIN stylesheet -->
                <link href="{stylesheet_uri}" type="text/css" rel="StyleSheet">
         <!-- END stylesheet -->
@@ -39,8 +39,6 @@
                        }
                </style>
 
-               {css}
-
                <script type="text/javascript">
                <!--
                        var strBaseURL = '{str_base_url}';

Added: branches/dev-syncromind/phpgwapi/templates/pure/themes/blue.css
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/themes/blue.css             
                (rev 0)
+++ branches/dev-syncromind/phpgwapi/templates/pure/themes/blue.css     
2015-11-16 09:08:26 UTC (rev 14361)
@@ -0,0 +1,90 @@
+body {
+       background-color: #fff;
+       color: #666;
+}
+body *
+{
+       text-shadow: none;
+}
+a, a:link, a:active, a:visited, a:hover
+{
+       color: #333;
+}
+
+.header,
+.footer
+{
+       background: #3968c6;
+       color: #fff;
+}
+
+/* Tabs container */
+.r-tabs {
+       background-color: #999999;
+       border-top: 1px solid #999999;
+       border-right: 1px solid #999999;
+       border-left: 1px solid #999999;
+       border-bottom: 4px solid #999999;
+
+}
+
+/* Tab element */
+.r-tabs .r-tabs-nav .r-tabs-tab {
+
+       background-color: #999999;
+}
+
+/* Tab anchor */
+.r-tabs .r-tabs-nav .r-tabs-anchor {
+       color: #fff;
+}
+
+/* Disabled tab */
+.r-tabs .r-tabs-nav .r-tabs-state-disabled {
+       opacity: 0.5;
+}
+
+/* Active state tab anchor */
+.r-tabs .r-tabs-nav .r-tabs-state-active .r-tabs-anchor {
+       color: #999999;
+       background-color: white;
+}
+
+/* Tab panel */
+.r-tabs .r-tabs-panel {
+       background-color: white;
+
+       border-bottom: 4px solid white;
+}
+
+/* Accordion anchor */
+.r-tabs .r-tabs-accordion-title .r-tabs-anchor {
+
+       background-color: #999999;
+       color: #fff;
+}
+
+/* Active accordion anchor */
+.r-tabs .r-tabs-accordion-title.r-tabs-state-active .r-tabs-anchor {
+       background-color: #fff;
+       color: #999999;
+       text-shadow: none;
+}
+
+/* Disabled accordion button */
+.r-tabs .r-tabs-accordion-title.r-tabs-state-disabled {
+       opacity: 0.5;
+}
+
+/* Buttons */
+button {
+       color: #fff;
+}
+
+/* Info bar */
+.info {
+       color: #999999;
+       border: 2px solid #00ab94;
+       background-color: #fff;
+} 
+

Added: branches/dev-syncromind/phpgwapi/templates/pure/themes/grey.css
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/themes/grey.css             
                (rev 0)
+++ branches/dev-syncromind/phpgwapi/templates/pure/themes/grey.css     
2015-11-16 09:08:26 UTC (rev 14361)
@@ -0,0 +1,20 @@
+body {
+       background-color: #fff;
+       color: #666;
+}
+body *
+{
+       text-shadow: none;
+}
+a, a:link, a:active, a:visited, a:hover
+{
+       color: #333;
+}
+
+.header,
+.footer
+{
+       background: #777;
+       color: #fff;
+}
+