Skip to content

Commit ca5a461

Browse files
committed
Fix theme display issues
Header and footer clean up Action menu dropdown List view buttons
1 parent f36302e commit ca5a461

File tree

8 files changed

+21
-28
lines changed

8 files changed

+21
-28
lines changed

include/MVC/View/SugarView.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ private function _getStatistics()
12611261
number_format(round($deltaTime, 2), 2) .
12621262
' ' .
12631263
$GLOBALS['app_strings']['LBL_SERVER_RESPONSE_TIME_SECONDS'];
1264-
$return = $response_time_string;
1264+
$return = $response_time_string. '<br />';
12651265

12661266
if (!empty($GLOBALS['sugar_config']['show_page_resources'])) {
12671267
// Print out the resources used in constructing the page.

themes/SuiteP/css/suitep-base/editview.scss

+4-11
Original file line numberDiff line numberDiff line change
@@ -297,13 +297,13 @@ a#powered_by:hover {
297297
#copyright_data {
298298
padding-left: 1%;
299299
display: inline-block;
300+
vertical-align: top;
300301
}
301302

302303
.footer_right {
303304
padding-right: 1%;
304305
float: right;
305306
text-align: right;
306-
width: 47%;
307307
text-transform: uppercase;
308308
}
309309

@@ -4010,7 +4010,6 @@ select#sales_stage_advanced {
40104010
padding: 0;
40114011
padding-left: 20px;
40124012
margin: 0;
4013-
width: 250px;
40144013
display: inline-block;
40154014
}
40164015

@@ -4969,11 +4968,9 @@ object {
49694968

49704969
}
49714970

4972-
.detail table
4973-
table.detail {
4971+
.detail table table.detail {
49744972
font-size: 1em;
49754973
background: none;
4976-
49774974
}
49784975

49794976
.edit h4 {
@@ -5061,12 +5058,8 @@ object {
50615058
}
50625059

50635060
@media (max-width: 750px) {
5064-
.footer_left {
5065-
text-align: center;
5066-
width: 100%;
5067-
}
5068-
5069-
.footer_right {
5061+
.footer_left, .footer_right, .serverstats {
5062+
padding: 0;
50705063
text-align: center;
50715064
width: 100%;
50725065
}

themes/SuiteP/css/suitep-base/listview.scss

+5-1
Original file line numberDiff line numberDiff line change
@@ -1965,6 +1965,11 @@ ul.clickMenu.selectmenu.SugarActionMenu.listViewLinkButton > li.desktopOnly > a.
19651965
padding: 6px;
19661966
}
19671967

1968+
ul.clickMenu.selectmenu.SugarActionMenu.listViewLinkButton > li > a.glyphicon-list-alt {
1969+
left: 2px;
1970+
height: 24px;
1971+
}
1972+
19681973
}
19691974

19701975
/* search form (and popup search form) */
@@ -2762,7 +2767,6 @@ listViewLinkButton {
27622767
#actionLinkTop li.sugar_action_button,
27632768
#actionLinkBottom li.sugar_action_button {
27642769
min-width: 32px;
2765-
height: 31px;
27662770
}
27672771

27682772
.action-link-top li.sugar_action_button,

themes/SuiteP/css/suitep-base/navbar.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767

6868
.with-home-icon .suitepicon-action-home {
69-
line-height: $navbar-toolbar-height;
69+
line-height: $navbar-toolbar-height - 5px;
7070
}
7171

7272
.dropdown-menu > li > a {

themes/SuiteP/css/suitep-base/sidebar.scss

-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ footer {
270270
bottom: 0;
271271
background-color: $footer-btn-bg;
272272
margin: 0 0 0 0;
273-
border: 1px solid transparent;
274273
border-radius: $border-radius-base;
275274
line-height: 38px;
276275
width: 100%;

themes/SuiteP/css/suitep-base/tabs.scss

-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@
141141
color: $action-tab-color;
142142
cursor: pointer;
143143
border-color: $action-tab-bg;
144-
border-bottom: $action-tab-separator;
145144
}
146145

147146
#tab-actions > a .suitepicon-action-caret {

themes/SuiteP/tpls/footer.tpl

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
66
*
77
* SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
8-
* Copyright (C) 2011 - 2018 SalesAgility Ltd.
8+
* Copyright (C) 2011 - 2020 SalesAgility Ltd.
99
*
1010
* This program is free software; you can redistribute it and/or modify it under
1111
* the terms of the GNU Affero General Public License version 3 as published by the
@@ -45,28 +45,28 @@
4545
{if $AUTHENTICATED}
4646
<!-- Start generic footer -->
4747
<footer>
48-
{if $STATISTICS}
49-
<div class="serverstats">
50-
<span class="glyphicon glyphicon-globe"></span> {$STATISTICS}
51-
</div>
52-
{/if}
53-
<div id="copyright_data">
54-
<div id="dialog2" title="{$APP.LBL_SUITE_SUPERCHARGED}">
48+
<div id="copyright_data" class="footer_left">
49+
<div id="dialog2" title="{$APP.LBL_SUITE_SUPERCHARGED}" style="display: none">
5550
<p>{$APP.LBL_SUITE_DESC1}</p>
5651
<br>
5752
<p>{$APP.LBL_SUITE_DESC2}</p>
5853
<br>
5954
<p>{$APP.LBL_SUITE_DESC3}</p>
6055
<br>
6156
</div>
62-
<div id="dialog" title="&copy; {$APP.LBL_SUITE_POWERED_BY}">
57+
<div id="dialog" title="&copy; {$APP.LBL_SUITE_POWERED_BY}" style="display: none">
6358
<p>{$COPYRIGHT}</p>
6459
</div>
65-
<div id="copyrightbuttons" class="footer_left">
60+
<div id="copyrightbuttons">
6661
<a id="admin_options">&copy; {$APP.LBL_SUITE_SUPERCHARGED}</a>
6762
<a id="powered_by">&copy; {$APP.LBL_SUITE_POWERED_BY}</a>
6863
</div>
6964
</div>
65+
{if $STATISTICS}
66+
<div class="serverstats">
67+
<span class="glyphicon glyphicon-globe"></span> {$STATISTICS}
68+
</div>
69+
{/if}
7070
<div class="footer_right">
7171

7272
<a onclick="SUGAR.util.top();" href="javascript:void(0)">{$APP.LBL_SUITE_TOP}<span class="suitepicon suitepicon-action-above"></span> </a>

themes/SuiteP/tpls/header.tpl

-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
</div>
4848
{/if}
4949
{literal}
50-
<iframe id='ajaxUI-history-iframe' src='index.php?entryPoint=getImage&imageName=blank.png' title='empty'
51-
style='display:none'></iframe>
5250
<input id='ajaxUI-history-field' type='hidden'>
5351
<script type='text/javascript'>
5452
if (SUGAR.ajaxUI && !SUGAR.ajaxUI.hist_loaded) {

0 commit comments

Comments
 (0)