Merge pull request #559 from gymad/7.4beta2-demo

7.4beta2 demo
salesagility · Oct 12, 2015 · 5943e36 · 5943e36
2 parents 7c27bce + 07439ad
commit 5943e36
Show file tree

Hide file tree

Showing 10 changed files with 233 additions and 239 deletions.
diff --git a/custom/Extension/modules/Administration/Ext/Language/en_us.colourAdmin.php b/custom/Extension/modules/Administration/Ext/Language/en_us.colourAdmin.php
@@ -34,4 +34,6 @@
 $mod_strings['LBL_COLOUR_ADMIN_BTNLNKHOVER'] = 'Button link hover colour: ';
 $mod_strings['LBL_COLOUR_ADMIN_DASHHEAD'] = 'Dashlet header colour: ';
 $mod_strings['LBL_COLOUR_ADMIN_ICON'] = 'Icon colour: ';
-$mod_strings['LBL_COLOUR_ADMIN_TABS'] = 'Menu contents config';
+$mod_strings['LBL_COLOUR_ADMIN_TABS'] = 'Menu contents config';
+$mod_strings['LBL_SUGGESTION_POPUP_FROM'] = 'Suggestion & Pop-up gradient (from):';
+$mod_strings['LBL_SUGGESTION_POPUP_TO'] = 'Suggestion & Pop-up gradient (to):';
diff --git a/include/SugarTheme/SugarTheme.php b/include/SugarTheme/SugarTheme.php
@@ -594,14 +594,13 @@ public function getCSS(
         )
     {
         // include style.css file
-        $html = '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('yui.css').'" />';
+        $html = '
+            <!-- qtip & suggestion box -->
+            <link rel="stylesheet" type="text/css" href="include/javascript/qtip/jquery.qtip.min.css" />';
+        $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('yui.css').'" />';
         $html .= '<link rel="stylesheet" type="text/css" href="include/javascript/jquery/themes/base/jquery.ui.all.css" />';
         $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('deprecated.css').'" />';
         $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('style.css').'" />';
-        $html .= '
-            <!-- qtip & suggestion box -->
-            <link rel="stylesheet" type="text/css" href="include/javascript/qtip/jquery.qtip.min.css" />';
-        $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('suggestion.css').'" />';
 
 
 		// sprites

diff --git a/themes/Suite7/css/colourSelector.php b/themes/Suite7/css/colourSelector.php
@@ -92,4 +92,25 @@
 
 #moduleList ul li ul.cssmenu li a {
 color:#<?php echo $sugar_config['theme_settings']['Suite7']['cssmenulink']; ?>;
+}
+
+
+
+/* popup colors */
+
+.yui-module .hd, .yui-panel .hd {
+background-color: #<?php echo $sugar_config['theme_settings']['SuiteR']['suggestion_popup_from']; ?>;
+background: #<?php echo $sugar_config['theme_settings']['SuiteR']['suggestion_popup_from']; ?> none repeat scroll 0 0;
+}
+
+/* suggestion box and popup */
+
+
+#suggestion_box table {
+color: #<?php echo $sugar_config['theme_settings']['SuiteR']['page_link']; ?>;
+}
+.qtip-tipped .qtip-titlebar {
+    background-color: #<?php echo $sugar_config['theme_settings']['Suite7']['suggestion_popup_from']; ?>;
+    background-image: -webkit-gradient(linear,left top,left bottom,from(#<?php echo $sugar_config['theme_settings']['Suite7']['suggestion_popup_from']; ?>),to(#<?php echo $sugar_config['theme_settings']['Suite7']['suggestion_popup_to']; ?>));
+    background-image: -webkit-linear-gradient(top,#<?php echo $sugar_config['theme_settings']['Suite7']['suggestion_popup_from']; ?>,#<?php echo $sugar_config['theme_settings']['Suite7']['suggestion_popup_to']; ?>);
 }
diff --git a/themes/Suite7/css/style.css b/themes/Suite7/css/style.css
@@ -5450,3 +5450,72 @@ div.password {
 #toolbox{
     overflow:auto;
 }
+
+
+/* suggestion-box */
+
+#suggestion_box table {
+    padding-left: 10px;
+    padding-top: 10px;
+    width: 100%;
+    max-width: 400px;
+    color: #3C8DBC;
+    border-spacing: 0px;
+    border: 1px solid #cccccc;
+}
+#suggestion_box table tr {
+}
+#suggestion_box table tr:hover {
+    background-color: #dfeffe;
+    cursor: pointer;
+}
+#suggestion_box table tr th {
+    padding: 4px!important;
+    text-align:left;
+    background-color: #f0f0ee;
+    color: #333333;
+}
+#suggestion_box table tr td {
+    padding: 4px!important;
+    margin: 0px;
+}
+#tool-tip-separator {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+.tool-tip-title {
+    margin-bottom: 3px;
+    display: inline-block;
+}
+
+#use_resolution {
+    margin-top: 4px;
+}
+#additional_info_p {
+    margin-bottom: 4px;
+}
+.transfer {
+    border: 2px dotted gray;
+}
+
+.qtip-content {
+    max-height: 450px;
+    overflow-y: auto;
+}
+
+.qtip {
+    font-family: Arial, Verdana, Helvetica, sans-serif;
+    font-size: 12px;
+    background: #ffffff;
+    border: 1px solid #cccccc;
+    -webkit-border-radius: 0px;
+    border-radius: 0px;
+}
+
+.qtip-tipped .qtip-titlebar {
+    background-color: #333333;
+    padding: 10px 40px 10px 10px;
+    background-image: -webkit-gradient(linear,left top,left bottom,from(#333333),to(#222222));
+    background-image: -webkit-linear-gradient(top,#333333,#222222);
+}
diff --git a/themes/Suite7/css/suggestion.css b/themes/Suite7/css/suggestion.css
diff --git a/themes/Suite7/themedef.php b/themes/Suite7/themedef.php
@@ -133,6 +133,17 @@
             'type' => 'colour',
             'default' => '#777777'
         ),
+
+        'suggestion_popup_from' => array(
+            'vname' => 'LBL_SUGGESTION_POPUP_FROM',
+            'type' => 'colour',
+            'default' => '#333333'
+        ),
+        'suggestion_popup_to' => array(
+            'vname' => 'LBL_SUGGESTION_POPUP_TO',
+            'type' => 'colour',
+            'default' => '#222222'
+        ),
     )
 
 );
diff --git a/themes/SuiteR/css/colourSelector.php b/themes/SuiteR/css/colourSelector.php
@@ -111,4 +111,24 @@
 ul#globalLinksSubnav li a:hover, ul#quickCreateULSubnav li a:hover {
 background:#<?php echo $sugar_config['theme_settings']['SuiteR']['button_hover']; ?> !important;
 color:#<?php echo $sugar_config['theme_settings']['SuiteR']['button_link_hover']; ?> !important;
+}
+
+/* popup colors */
+
+.yui-module .hd, .yui-panel .hd {
+    background-color: #<?php echo $sugar_config['theme_settings']['SuiteR']['suggestion_popup_from']; ?>;
+    background: #<?php echo $sugar_config['theme_settings']['SuiteR']['suggestion_popup_from']; ?> none repeat scroll 0 0;
+}
+
+/* suggestion box and popup */
+
+
+#suggestion_box table {
+    color: #<?php echo $sugar_config['theme_settings']['SuiteR']['page_link']; ?>;
+}
+
+.qtip-tipped .qtip-titlebar {
+    background-color: #<?php echo $sugar_config['theme_settings']['SuiteR']['suggestion_popup_from']; ?>;
+    background-image: -webkit-gradient(linear,left top,left bottom,from(#<?php echo $sugar_config['theme_settings']['SuiteR']['suggestion_popup_from']; ?>),to(#<?php echo $sugar_config['theme_settings']['SuiteR']['suggestion_popup_to']; ?>));
+    background-image: -webkit-linear-gradient(top,#<?php echo $sugar_config['theme_settings']['SuiteR']['suggestion_popup_from']; ?>,#<?php echo $sugar_config['theme_settings']['SuiteR']['suggestion_popup_to']; ?>);
 }
diff --git a/themes/SuiteR/css/style.css b/themes/SuiteR/css/style.css
@@ -4675,5 +4675,100 @@ object{
 
 
 
+/* suggestion box and popup */
+
+#suggestion_box table {
+    border: 1px solid #cccccc;
+    padding: 0px !important;
+    width: 100%;
+    max-width: 400px;
+    color: #337ab7;
+    border-spacing: 0px;
+}
+#suggestion_box table tr {
+    border-bottom: 1px solid #cccccc;
+}
+#suggestion_box table tr:hover {
+    background-color: #dfeffe;
+    cursor: pointer;
+}
+#suggestion_box table tr th {
+    padding: 4px!important;
+    text-align:left;
+    background-color: #f0f0ee;
+    color: #333333;
+}
+#suggestion_box table tr td {
+    margin: 0px;
+    border: none;
+}
+#tool-tip-separator {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+.tool-tip-title {
+    margin-bottom: 3px;
+    display: inline-block;
+}
+
+#use_resolution {
+    margin-top: 4px;
+    padding: 8px;
+}
+#additional_info_p {
+    margin-bottom: 4px;
+}
+.transfer {
+    border: 2px dotted gray;
+}
+
+.qtip-content {
+    max-height: 450px;
+    overflow-y: auto;
+}
+
+.qtip {
+    font-family: Arial, Verdana, Helvetica, sans-serif;
+    font-size: 12px;
+    background: #ffffff;
+    border: 1px solid #cccccc;
+    -webkit-border-radius: 0px;
+    border-radius: 0px;
+}
+
+
+.qtip-tipped .qtip-titlebar {
+    background-color: #3c8dbc;
+    padding: 10px 40px 10px 10px;
+    background-image: -webkit-gradient(linear,left top,left bottom,from(#3c8dbc),to(#4286AD));
+    background-image: -webkit-linear-gradient(top,#3c8dbc,#4286AD);
+}
+
+/* suggestion box has to be responsive */
+
+@media (max-width: 640px) {
+
+    #suggestion_box table {
+        border: none;
+    }
+
+    #suggestion_box table tbody tr {
+        display: table-row;
+        border: 1px solid #ccc;
+        padding: 0;
+    }
+
+    #suggestion_box table tbody tr th,
+    #suggestion_box table tbody tr td {
+        display: table-cell;
+        width: auto;
+    }
+
+}
+
+
+
+
 /* End SuiteCRM Responsive/Bootstrap additional CSS */
 /* End Global CSS */