diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-05-27 04:08:01 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-05-27 04:08:01 +0400 |
commit | a9445e18846db29e7405e6f532146db4fcf35061 (patch) | |
tree | f56fe8f3398dfef371ee11d493cd613560a7cf50 | |
parent | 60d482963a5a520014772280b6ba97fdac6a4372 (diff) | |
parent | 2394fe583c7ea20334157263c3d1547e883d4843 (diff) |
Merge remote-tracking branch 'origin/master'1.12-b21
-rw-r--r-- | plugins/CoreHome/templates/period_select.tpl | 1 | ||||
-rw-r--r-- | plugins/Goals/templates/overview.tpl | 2 | ||||
-rw-r--r-- | plugins/UserSettings/functions.php | 15 | ||||
-rw-r--r-- | themes/default/common.css | 11 |
4 files changed, 25 insertions, 4 deletions
diff --git a/plugins/CoreHome/templates/period_select.tpl b/plugins/CoreHome/templates/period_select.tpl index 1e0c2a6209..61e19274d2 100644 --- a/plugins/CoreHome/templates/period_select.tpl +++ b/plugins/CoreHome/templates/period_select.tpl @@ -2,6 +2,7 @@ <div id="periodString"> <div id="date">{'General_DateRange'|translate} <b>{$prettyDate}</b> </div> + <div class="calendar-icon"></div> <div id="periodMore"> <div class="period-date"> <h6>{'General_Date'|translate}</h6> diff --git a/plugins/Goals/templates/overview.tpl b/plugins/Goals/templates/overview.tpl index 0e971602ce..dc20c84390 100644 --- a/plugins/Goals/templates/overview.tpl +++ b/plugins/Goals/templates/overview.tpl @@ -32,6 +32,7 @@ {/foreach} {if $displayFullReport} + {if $sum_nb_conversions neq 0} <h2 id='titleGoalsByDimension'> {if isset($idGoal)} {'Goals_GoalConversionsBy'|translate:$goalName} @@ -40,6 +41,7 @@ {/if} </h2> {$goalReportsByDimension} + {/if} {if $userCanEditGoals} {include file="Goals/templates/add_edit_goal.tpl"} diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php index e1c5579608..80a63a589e 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -153,6 +153,16 @@ function Piwik_getBrowserVersion($str) return substr($str, strpos($str, ';') + 1); } +function Piwik_getLogoImageFromId($dir, $id) +{ + $path = $dir.'/'.$id.'.gif'; + if (file_exists(PIWIK_INCLUDE_PATH . '/' . $path)) { + return $path; + } else { + return $dir.'/UNK.gif'; + } +} + function Piwik_getBrowsersLogo($label) { $id = Piwik_getBrowserId($label); @@ -160,7 +170,7 @@ function Piwik_getBrowsersLogo($label) if (empty($id)) { $id = 'UNK'; } - return 'plugins/UserSettings/images/browsers/' . $id . '.gif'; + return Piwik_getLogoImageFromId('plugins/UserSettings/images/browsers', $id); } function Piwik_getOSLogo($label) @@ -169,8 +179,7 @@ function Piwik_getOSLogo($label) if (empty($label)) { $label = 'UNK'; } - $path = 'plugins/UserSettings/images/os/' . $label . '.gif'; - return $path; + return Piwik_getLogoImageFromId('plugins/UserSettings/images/os', $label); } function Piwik_getScreensLogo($label) diff --git a/themes/default/common.css b/themes/default/common.css index 6b9a99dd12..c33538a3c2 100644 --- a/themes/default/common.css +++ b/themes/default/common.css @@ -117,12 +117,21 @@ a { margin-right:12px; z-index:999; position:absolute; - background: url("images/icon-calendar.gif") no-repeat scroll right 9px top 7px #F7F7F7; + background-color: #f7f7f7; } #periodString:hover { background-color:#f1f0eb; border-color:#a9a399; } +#periodString .calendar-icon { + width: 13px; + height: 15px; + display:inline-block; + position:absolute; + right:9px; + top:7px; + background: url("images/icon-calendar.gif") no-repeat scroll; +} #periodString #date{ cursor:pointer; display:inline-block; |