diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index 0c203f3a46bd64a385c8cc3cceaef697af0810ea..77be52bcc445ea57beab8fd99b03ef9c5e2bc86b 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -246,8 +246,8 @@
{% for hostIdx, host in trustedHosts %}
<li>
<input name="trusted_host" type="text" value="{{ host }}"/>
- <a href="#" class="remove-trusted-host" title="{{ 'General_Delete'|translate }}">
- <img alt="{{ 'General_Delete'|translate }}" src="plugins/Morpheus/images/ico_delete.png" />
+ <a href="#" class="remove-trusted-host btn btn-flat btn-lg" title="{{ 'General_Delete'|translate }}">
+ <span class="icon-minus"></span>
</a>
</li>
{% endfor %}
@@ -256,8 +256,8 @@
<div class="add-trusted-host">
<input type="text" placeholder="{{ 'CoreAdminHome_AddNewTrustedHost'|translate|e('html_attr') }}" readonly/>
- <a href="#" title="{{ 'General_Delete'|translate }}">
- <img alt="{{ 'General_Delete'|translate }}" src="plugins/Morpheus/images/add.png"/>
+ <a href="#" class="btn btn-flat btn-lg" title="{{ 'General_Add'|translate }}">
+ <span class="icon-add"></span>
</a>
</div>
diff --git a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
index 53dbca5f2cbef082cdc995cde38494bc7155368d..279972330c9ba00862d772383846a55eee23746c 100644
--- a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
+++ b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
@@ -11,12 +11,12 @@
target="_blank"
href="{{ helpUrl }}"
title="{{ 'CoreHome_ExternalHelp'|translate }}"
- class="helpIcon"></a>
+ class="helpIcon"><span class="icon-help"></span></a>
<a ng-if="inlineHelp"
title="{{ 'General_Help'|translate }}"
ng-click="view.showInlineHelp=!view.showInlineHelp"
- class="helpIcon"></a>
+ class="helpIcon"><span class="icon-help"></span></a>
<div class="ratingIcons"
piwik-rate-feature
@@ -31,4 +31,4 @@
href="{{ helpUrl }}"
class="readMore">{{ 'General_MoreDetails'|translate }}</a>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less
index 24f22ca812d884cf33c99e3413d56dd57adbc4d3..d6a78db26f0af83476fd0a20ad2f4d980949379c 100644
--- a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less
+++ b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less
@@ -1,52 +1,49 @@
.inlineHelp {
- display: none;
+ display: none;
}
.enrichedHeadline {
- min-height: 22px;
+ min-height: 22px;
- a.title {
- cursor: pointer;
- }
-
- .title {
- color: @color-black-piwik;
- }
-
- .inlineHelp {
- display:block;
- background: #F7F7F7;
- font-size: 12px;
- font-weight: normal;
- border: 1px solid #E4E5E4;
- margin: 10px 0 10px 0;
- padding: 10px;
- border-radius: 4px;
- max-width: 500px;
+ a.title {
+ cursor: pointer;
+ }
- .readMore {
- margin-top: 10px;
- display: inline-block;
- font-weight: bold;
+ .title {
+ color: @color-black-piwik;
}
- }
- .ratingIcons {
- display:inline-block;
- vertical-align: bottom;
- }
+ .inlineHelp {
+ display: block;
+ background: #F7F7F7;
+ font-size: 12px;
+ font-weight: normal;
+ border: 1px solid #E4E5E4;
+ margin: 10px 0 10px 0;
+ padding: 10px;
+ border-radius: 4px;
+ max-width: 500px;
+
+ .readMore {
+ margin-top: 10px;
+ display: inline-block;
+ font-weight: bold;
+ }
+ }
- .helpIcon:hover {
- opacity: 0.9;
- }
+ .ratingIcons {
+ display: inline-block;
+ vertical-align: bottom;
+ }
- .helpIcon {
- cursor: pointer;
- display:inline-block;
- margin: 0px 0px -1px 4px;
- width: 16px;
- opacity: 0.3;
- height: 16px;
- background: url(plugins/CoreHome/angularjs/enrichedheadline/help.png) no-repeat;
- }
-}
\ No newline at end of file
+ .helpIcon {
+ cursor: pointer;
+ display: inline-block;
+ margin: 0 0 -1px 4px;
+ opacity: 0.3;
+ font-size: 15px;
+ &:hover {
+ opacity: 0.9;
+ }
+ }
+}
diff --git a/plugins/CoreHome/angularjs/notification/notification.directive.html b/plugins/CoreHome/angularjs/notification/notification.directive.html
index a643be8a3b3da2df52f46e0bd4ac28843c9efdfc..be97d91d9a9c1b3c3fbb0135522255172aec4864 100644
--- a/plugins/CoreHome/angularjs/notification/notification.directive.html
+++ b/plugins/CoreHome/angularjs/notification/notification.directive.html
@@ -3,6 +3,6 @@
<strong ng-if="title">{{ title }}</strong>
<!-- ng-transclude causes directive child elements to be added here -->
- <div ng-transclude style="display:inline-block"></div>
+ <div ng-transclude></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/CoreHome/javascripts/dataTable_rowactions.js b/plugins/CoreHome/javascripts/dataTable_rowactions.js
index ac8554593ee1f01fce2a7bc96f859f578a862ba5..004e27e3b67694e7da304620e92911baf81e2a85 100644
--- a/plugins/CoreHome/javascripts/dataTable_rowactions.js
+++ b/plugins/CoreHome/javascripts/dataTable_rowactions.js
@@ -360,7 +360,7 @@ DataTable_RowActions_RowEvolution.prototype.showRowEvolution = function (apiMeth
if (self.dataTable !== null) {
// remember label for multi row evolution
- box.find('a.rowevolution-startmulti').click(function () {
+ box.find('.rowevolution-startmulti').click(function () {
Piwik_Popover.onClose(false); // unbind listener that resets multiEvolutionRows
Piwik_Popover.close();
return false;
diff --git a/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less b/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less
index c7c39b87e4b29c4404a03b103302ab82d90a03b1..117fcf8716a6ce646f87554b6cae509f8de76a90 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less
@@ -17,9 +17,8 @@ table.dataTable th .columnDocumentation {
}
table.dataTable th .columnDocumentationTitle {
- background: url(plugins/Morpheus/images/help.png) no-repeat;
line-height: 14px;
- padding: 2px 0 3px 21px;
+ padding: 3px 0;
font-weight: bold;
}
@@ -41,21 +40,3 @@ table.dataTable th .columnDocumentationTitle {
color: @theme-color-text-light;
font-size: 12px;
}
-
-.reportDocumentationIcon {
- display: block;
- width: 16px;
- height: 16px;
- margin: 10px 0;
- background: url(plugins/Morpheus/images/help.png) no-repeat;
-}
-
-h2 .reportDocumentationIcon {
- position: absolute;
- margin: 4px 0 0 0;
- display: none;
-}
-
-h2 .reportDocumentationIcon.hidden {
- background: none;
-}
\ No newline at end of file
diff --git a/plugins/CoreHome/templates/_dataTableHead.twig b/plugins/CoreHome/templates/_dataTableHead.twig
index 47091b3c0fe24164e37ed174b827d1586b699a99..161de44b2396d41b446412307511837050685baf 100644
--- a/plugins/CoreHome/templates/_dataTableHead.twig
+++ b/plugins/CoreHome/templates/_dataTableHead.twig
@@ -5,6 +5,7 @@
{% if properties.metrics_documentation[column]|default is not empty %}
<div class="columnDocumentation">
<div class="columnDocumentationTitle">
+ <span class="icon-help"></span>
{{ properties.translations[column]|default(column)|raw }}
</div>
{{ properties.metrics_documentation[column]|raw }}
diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig
index e78ccac4fd40847a4920e3592c64d9eeb263931e..c1d81b5cb0f0dc9e2a4234719728462b9ab4240f 100644
--- a/plugins/CoreHome/templates/_headerMessage.twig
+++ b/plugins/CoreHome/templates/_headerMessage.twig
@@ -6,7 +6,7 @@
{% set updateCheck %}
<div id="updateCheckLinkContainer">
<span class='loadingPiwik' style="display:none;"><img src='plugins/Morpheus/images/loading-blue.gif'/></span>
- <img class="icon" src="plugins/Morpheus/images/reload.png"/>
+ <span class="icon icon-reload"></span>
<a href="#" id="checkForUpdates"><em>{{ 'CoreHome_CheckForUpdates'|translate }}</em></a>
</div>
{% endset %}
@@ -44,4 +44,4 @@
{{ 'General_YouAreCurrentlyUsing'|translate(piwik_version) }}
</span>
</span>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/plugins/CoreHome/templates/_warningInvalidHost.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig
index 71d2716893465fdb917cbd23c8231aa110e7db87..c93539346fabb2ac0b6a36e67594b3d2cc221d07 100644
--- a/plugins/CoreHome/templates/_warningInvalidHost.twig
+++ b/plugins/CoreHome/templates/_warningInvalidHost.twig
@@ -1,16 +1,16 @@
{# untrusted host warning #}
{% if (isValidHost is defined and invalidHostMessage is defined and isValidHost == false) %}
{% set invalidHostText %}
- <a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank"><img src="plugins/Morpheus/images/help.png"/></a>
+ <a class="btn btn-link" style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank">
+ <span class="icon-help"></span>
+ {{ 'General_Help'|translate }}
+ </a>
<strong>{{ 'General_Warning'|translate }}: </strong>{{ invalidHostMessage|raw }}
<br>
<br>
- <small>{{ invalidHostMessageHowToFix|raw }}
- <br/><br/><a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank">{{ 'General_Help'|translate }}
- <img style="vertical-align: bottom;" src="plugins/Morpheus/images/help.png"/></a><br/>
- </small>
+ {{ invalidHostMessageHowToFix|raw }}
{% endset %}
<div style="clear:both;width:800px;">
diff --git a/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
index a43d282492933686b0f0caab2072f136304b1272..6159dad5bef23c088353f8ca53f0dc665168bcdc 100644
--- a/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
+++ b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
@@ -23,7 +23,7 @@
</tr>
{% endfor %}
</table>
- <a href="#" class="rowevolution-startmulti">» {{ 'RowEvolution_PickAnotherRow'|translate }}</a>
+ <a href="#" class="rowevolution-startmulti btn btn-flat">» {{ 'RowEvolution_PickAnotherRow'|translate }}</a>
</div>
{% if availableMetrics|length > 1 %}
<div class="metric-selectbox">
diff --git a/plugins/CoreHome/templates/getRowEvolutionPopover.twig b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
index 5a86f7a101bb789329e99c2099e8670484e7e0e1..133c94e58b90cde096961520900c00e59cff72fa 100644
--- a/plugins/CoreHome/templates/getRowEvolutionPopover.twig
+++ b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
@@ -7,7 +7,7 @@
<div class="metrics-container">
<h2>{{ availableMetricsText|raw }}</h2>
- <div class="rowevolution-documentation">
+ <div class="alert alert-info">
{{ 'RowEvolution_Documentation'|translate }}
</div>
<table class="metrics" border="0" cellpadding="0" cellspacing="0" data-thing="{{ seriesColorCount }}">
@@ -31,9 +31,9 @@
<div class="compare-container">
<h2>{{ 'RowEvolution_CompareRows'|translate }}</h2>
- <div class="rowevolution-documentation">
+ <div class="alert alert-info">
{{ 'RowEvolution_CompareDocumentation'|translate|raw }}
</div>
- <a href="#" class="rowevolution-startmulti">» {{ 'RowEvolution_PickARow'|translate }}</a>
+ <a href="#" class="rowevolution-startmulti btn btn-flat">» {{ 'RowEvolution_PickARow'|translate }}</a>
</div>
</div>
diff --git a/plugins/CoreVisualizations/stylesheets/jqplot.css b/plugins/CoreVisualizations/stylesheets/jqplot.css
index 25b6535f5c9a6bb99bd072f6e98e9106dba13421..6ef4a5ce820abb27178548c969fabb0fb5044083 100644
--- a/plugins/CoreVisualizations/stylesheets/jqplot.css
+++ b/plugins/CoreVisualizations/stylesheets/jqplot.css
@@ -165,14 +165,6 @@
color: #f00;
}
-.rowevolution-documentation {
- font-size: 12px;
- margin: 2px 0 5px 0;
- padding: 5px 0 5px 23px;
- color: #888;
- background: url(../../Morpheus/images/help.png) no-repeat left center;
-}
-
.rowevolution .metric-selectbox,
.rowevolution .compare-container {
padding: 15px 0 5px 0;
@@ -185,17 +177,6 @@
padding: 0;
}
-a.rowevolution-startmulti {
- font-size: 12px;
- color: #7E7363;
- font-weight: bold;
- text-decoration: none;
-}
-
-a.rowevolution-startmulti:hover {
- color: #444;
-}
-
/**
* SERIES PICKER FOR CHARTS
*/
@@ -258,4 +239,4 @@ a.rowevolution-startmulti:hover {
.jqplot-seriespicker-popover p.pickColumn,
.jqplot-seriespicker-popover p.pickRow {
cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/plugins/Dashboard/templates/_widgetFactoryTemplate.twig b/plugins/Dashboard/templates/_widgetFactoryTemplate.twig
index 0d5b0d61547846efa380546dce883594cdc5dfc5..05e979f8dac4d483b1f48afd4f8a3d210e92bbca 100644
--- a/plugins/Dashboard/templates/_widgetFactoryTemplate.twig
+++ b/plugins/Dashboard/templates/_widgetFactoryTemplate.twig
@@ -1,26 +1,26 @@
<div id="widgetTemplate" style="display:none;">
- <div class="widget">
- <div class="widgetTop">
- <div class="button" id="close">
- <img src="plugins/Morpheus/images/close.png" title="{{ 'General_Close'|translate }}" />
- </div>
- <div class="button" id="maximise">
- <img src="plugins/Morpheus/images/maximise.png" title="{{ 'Dashboard_Maximise'|translate }}" />
- </div>
- <div class="button" id="minimise">
- <img src="plugins/Morpheus/images/minimise.png" title="{{ 'Dashboard_Minimise'|translate }}" />
- </div>
- <div class="button" id="refresh">
- <img src="plugins/Morpheus/images/refresh.png" title="{{ 'General_Refresh'|translate }}" />
- </div>
- <h3 class="widgetName">{% if widgetName is defined %}{{ widgetName }}{% endif %}
- <div class="widgetNameOffScreen">
- {{ 'General_Widget'|translate }}
+ <div class="widget">
+ <div class="widgetTop">
+ <div class="button" id="close">
+ <span class="icon-close" title="{{ 'General_Close'|translate }}"></span>
+ </div>
+ <div class="button" id="maximise">
+ <span class="icon-fullscreen" title="{{ 'Dashboard_Maximise'|translate }}"></span>
+ </div>
+ <div class="button" id="minimise">
+ <span class="icon-minimise" title="{{ 'Dashboard_Minimise'|translate }}"></span>
+ </div>
+ <div class="button" id="refresh">
+ <span class="icon-reload" title="{{ 'General_Refresh'|translate }}"></span>
+ </div>
+ <h3 class="widgetName">{% if widgetName is defined %}{{ widgetName }}{% endif %}
+ <div class="widgetNameOffScreen">
+ {{ 'General_Widget'|translate }}
+ </div>
+ </h3>
+ </div>
+ <div class="widgetContent">
+ <div class="widgetLoading">{{ 'Dashboard_LoadingWidget'|translate }}</div>
</div>
- </h3>
- </div>
- <div class="widgetContent">
- <div class="widgetLoading">{{ 'Dashboard_LoadingWidget'|translate }}</div>
</div>
- </div>
</div>
diff --git a/plugins/Goals/javascripts/goalsForm.js b/plugins/Goals/javascripts/goalsForm.js
index 5d8c4a93cce9f4c9a0c0de066e16682afd417ba5..2ab5944af87a18d9ddb1c18ec21b5ac14f9da151 100644
--- a/plugins/Goals/javascripts/goalsForm.js
+++ b/plugins/Goals/javascripts/goalsForm.js
@@ -37,11 +37,11 @@ function showCancel() {
}
function showCreateGoal() {
- $("div[name=linkAddNewGoal]").show();
+ $("#add-goal").show();
}
function hideCreateGoal() {
- $("div[name=linkAddNewGoal]").hide();
+ $("#add-goal").hide();
}
function onMatchAttributeChange(matchAttribute)
@@ -134,7 +134,7 @@ function bindGoalForm() {
return false;
});
- $('div[name=linkAddNewGoal]').click(function () {
+ $('#add-goal').click(function () {
initAndShowAddGoalForm();
piwikHelper.lazyScrollTo('#goal_name');
});
@@ -203,13 +203,13 @@ function editGoal(goalId)
}
function bindListGoalEdit() {
- $('a[name=linkEditGoal]').click(function () {
+ $('.edit-goal').click(function () {
var goalId = $(this).attr('id');
editGoal(goalId);
return false;
});
- $('a[name=linkDeleteGoal]').click(function () {
+ $('.delete-goal').click(function () {
var goalId = $(this).attr('id');
var goal = piwik.goals[goalId];
diff --git a/plugins/Goals/templates/_listGoalEdit.twig b/plugins/Goals/templates/_listGoalEdit.twig
index 74a7c31a76d53ff354619d77d1c56c47e0bcd272..2d8a87ca414ad10875133bd0f717838344376375 100644
--- a/plugins/Goals/templates/_listGoalEdit.twig
+++ b/plugins/Goals/templates/_listGoalEdit.twig
@@ -29,18 +29,18 @@
{{ 'Goals_Pattern'|translate }} {{ goal.pattern_type }}: {{ goal.pattern }}
{% endif %}
</td>
- <td>{% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite)|raw }}{% endif %}</td>
- <td>
- <a href='#' name="linkEditGoal" id="{{ goal.idgoal }}" class="link_but withIcon">
- <img src='plugins/Morpheus/images/ico_edit.png' border="0"/>
- {{ 'General_Edit'|translate }}
- </a>
+ <td class="text-center">
+ {% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite)|raw }}{% endif %}
</td>
- <td>
- <a href='#' name="linkDeleteGoal" id="{{ goal.idgoal }}" class="link_but withIcon">
- <img src='plugins/Morpheus/images/ico_delete.png' border="0"/>
- {{ 'General_Delete'|translate }}
- </a>
+ <td class="text-center">
+ <button id="{{ goal.idgoal }}" class="edit-goal btn btn-flat btn-lg" title="{{ 'General_Edit'|translate }}">
+ <span class="icon-edit"></span>
+ </button>
+ </td>
+ <td class="text-center">
+ <button id="{{ goal.idgoal }}" class="delete-goal btn btn-flat btn-lg" title="{{ 'General_Delete'|translate }}">
+ <span class="icon-delete"></span>
+ </button>
</td>
</tr>
{% endfor %}
@@ -48,11 +48,12 @@
</table>
{% if onlyShowAddNewGoal is not defined %}
- <br/>
- <div name="linkAddNewGoal" class="addrow"><img src='plugins/Morpheus/images/add.png'/> {{ 'Goals_AddNewGoal'|translate }}</div>
- <br/>
- <br/>
-
+ <p>
+ <button id="add-goal" class="btn btn-lg btn-flat">
+ <span class="icon-add"></span>
+ {{ 'Goals_AddNewGoal'|translate }}
+ </button>
+ </p>
{% endif %}
</div>
diff --git a/plugins/Installation/stylesheets/installation.css b/plugins/Installation/stylesheets/installation.css
index 6d6b97be5e52da4cf872f449574bd451531857bf..5621ae98df5bd4ea980cb0579e7252709642b282 100644
--- a/plugins/Installation/stylesheets/installation.css
+++ b/plugins/Installation/stylesheets/installation.css
@@ -85,3 +85,20 @@ p.next-step:first-child {
.warning img {
vertical-align: bottom;
}
+
+.system-check .icon-ok, .system-check-legend .icon-ok {
+ color: #1AA282;
+ margin-right: 10px;
+}
+.system-check .icon-warning, .system-check-legend .icon-warning {
+ color: #DF9D27;
+ margin-right: 10px;
+}
+.system-check .icon-error, .system-check-legend .icon-error {
+ color: #D73F36;
+ margin-right: 10px;
+}
+
+.system-check-legend {
+ font-size: 13px;
+}
diff --git a/plugins/Installation/stylesheets/systemCheckPage.less b/plugins/Installation/stylesheets/systemCheckPage.less
index 007671e849bb2c3e079fccc7c30ca1ee826f99e6..5035e8cd2e79521f6cac8b2ca1f6bc097e47d1b5 100755
--- a/plugins/Installation/stylesheets/systemCheckPage.less
+++ b/plugins/Installation/stylesheets/systemCheckPage.less
@@ -18,3 +18,15 @@
margin: 10px;
}
+.system-check .icon-ok {
+ color: #1AA282;
+ margin-right: 10px;
+}
+.system-check .icon-warning {
+ color: #DF9D27;
+ margin-right: 10px;
+}
+.system-check .icon-error {
+ color: #D73F36;
+ margin-right: 10px;
+}
diff --git a/plugins/Installation/templates/_systemCheckLegend.twig b/plugins/Installation/templates/_systemCheckLegend.twig
index 3d222ab4ba038dd74e784e8f64ba95a0b9cde2eb..c87f44cdeb9198e7417441b82bf58a0f2e83f010 100644
--- a/plugins/Installation/templates/_systemCheckLegend.twig
+++ b/plugins/Installation/templates/_systemCheckLegend.twig
@@ -1,13 +1,18 @@
-<div id="systemCheckLegend">
- <span style="font-size: small;">
- <h2>{{ 'Installation_Legend'|translate }}</h2>
- <br/>
- <img src='plugins/Morpheus/images/warning.png'/> <span class="warn">{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}</span>
- <br/>
- <img src='plugins/Morpheus/images/error.png'/> <span style="color:red;font-weight:bold;">{{ 'General_Error'|translate }}
- : {{ 'Installation_SystemCheckError'|translate }} </span><br/>
- <img src='plugins/Morpheus/images/ok.png'/> <span style="color:#26981C;font-weight:bold;">{{ 'General_Ok'|translate }}</span><br/>
- </span>
+<div class="system-check-legend">
+ <h2>{{ 'Installation_Legend'|translate }}</h2>
+
+ <p>
+ <span class="icon-ok"></span>
+ {{ 'General_Ok'|translate }}
+ </p>
+ <p>
+ <span class="icon-warning"></span>
+ {{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}
+ </p>
+ <p>
+ <span class="icon-error"></span>
+ {{ 'General_Error'|translate }}: {{ 'Installation_SystemCheckError'|translate }}
+ </p>
</div>
<p class="next-step">
diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig
index 2e8aaac1804bec7445bf8738ac7b7c1a9048b1fc..a2d0b7610ee432bbf2e9fb42407bd91d0a8d5e0c 100755
--- a/plugins/Installation/templates/_systemCheckSection.twig
+++ b/plugins/Installation/templates/_systemCheckSection.twig
@@ -15,9 +15,9 @@
{% set error = constant('Piwik\\Plugins\\Diagnostics\\Diagnostic\\DiagnosticResult::STATUS_ERROR') %}
{% set warning = constant('Piwik\\Plugins\\Diagnostics\\Diagnostic\\DiagnosticResult::STATUS_WARNING') %}
- {% set errorIcon %}<img src='plugins/Morpheus/images/error.png' />{% endset %}
- {% set warningIcon %}<img src='plugins/Morpheus/images/warning.png' />{% endset %}
- {% set okIcon %}<img src='plugins/Morpheus/images/ok.png' />{% endset %}
+ {% set errorIcon %} <span class="icon-error"></span> {% endset %}
+ {% set warningIcon %} <span class="icon-warning"></span> {% endset %}
+ {% set okIcon %} <span class="icon-ok"></span> {% endset %}
{% for result in results %}
<tr>
diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig
index a0f6a7f7f15406f9bb6a4dd9751350520417c629..f73ab100c034867e980178a2147a61b22948eda6 100644
--- a/plugins/Installation/templates/systemCheck.twig
+++ b/plugins/Installation/templates/systemCheck.twig
@@ -22,7 +22,7 @@
{% if not showNextStep %}
<p>
- <img src='plugins/Morpheus/images/link.gif'/>
+ <span class="icon-export"></span>
<a href="?module=Proxy&action=redirect&url=http://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
</p>
{% include "@Installation/_systemCheckLegend.twig" %}
diff --git a/plugins/Installation/templates/systemCheckPage.twig b/plugins/Installation/templates/systemCheckPage.twig
index 88f6b42688da23db3905b0799649caf16c6a7aa8..d5a16dca1f6354e3b1c02581892c2aca7eaffa22 100755
--- a/plugins/Installation/templates/systemCheckPage.twig
+++ b/plugins/Installation/templates/systemCheckPage.twig
@@ -4,20 +4,21 @@
<h2 piwik-enriched-headline>{{ 'Installation_SystemCheck'|translate }}</h2>
- <p style="margin-left:0.2em;">
- {% if diagnosticReport.hasErrors() %}
- <img src="plugins/Morpheus/images/error.png"/>
+ {% if diagnosticReport.hasErrors() %}
+ <div class="alert alert-danger">
{{ 'Installation_SystemCheckSummaryThereWereErrors'|translate('<strong>','</strong>','<strong><em>','</em></strong>')|raw }}
{{ 'Installation_SeeBelowForMoreInfo'|translate }}
- {% elseif diagnosticReport.hasWarnings() %}
- <img src="plugins/Morpheus/images/warning.png"/>
+ </div>
+ {% elseif diagnosticReport.hasWarnings() %}
+ <div class="alert alert-warning">
{{ 'Installation_SystemCheckSummaryThereWereWarnings'|translate }}
{{ 'Installation_SeeBelowForMoreInfo'|translate }}
- {% else %}
- <img src="plugins/Morpheus/images/ok.png"/>
+ </div>
+ {% else %}
+ <div class="alert alert-success">
{{ 'Installation_SystemCheckSummaryNoProblems'|translate }}
- {% endif %}
- </p>
+ </div>
+ {% endif %}
{% include "@Installation/_systemCheckSection.twig" %}
diff --git a/plugins/Live/stylesheets/visitor_profile.less b/plugins/Live/stylesheets/visitor_profile.less
index 7b82aee711a459b411ed1616d0ff45b3d94c7204..b92503efbe30934ce579321a01fd1cc5127f5d56 100644
--- a/plugins/Live/stylesheets/visitor_profile.less
+++ b/plugins/Live/stylesheets/visitor_profile.less
@@ -491,11 +491,11 @@ div.visitor-profile-navigation {
.visitor-profile-header {
position:relative;
- > .reportDocumentationIcon {
- display:none;
- margin:0;
- width:14px;
- background-size:14px;
+ .visitorProfileHelp {
+ display: none;
+ &:hover {
+ text-decoration: none;
+ }
}
}
@@ -513,7 +513,7 @@ a.visitor-profile-next-visitor,a.visitor-profile-prev-visitor {
}
.visitor-profile-avatar:hover {
- .visitor-profile-next-visitor,.visitor-profile-prev-visitor,.reportDocumentationIcon {
+ .visitor-profile-next-visitor,.visitor-profile-prev-visitor,.visitorProfileHelp {
display:inline-block;
}
}
diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
index 23ba3317fdf35f14f06ebb606a73d34dcd90bbff..2171d458f99f702ab5f810b8a5dfb313112c37d8 100644
--- a/plugins/Live/templates/getVisitorProfilePopup.twig
+++ b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -26,7 +26,9 @@
{%- if visitorData.userId is not empty %}: <span title="{{'General_UserId'|translate}}: {{ visitorData.userId|raw }}">{{ visitorData.userId|raw }}</span>{% endif -%}
<img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/>
</h1>
- <a href="http://piwik.org/docs/user-profile/" class="reportDocumentationIcon" rel="noreferrer" target="_blank" title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}"></a>
+ <a href="http://piwik.org/docs/user-profile/" class="visitorProfileHelp" rel="noreferrer" target="_blank" title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}">
+ <span class="icon-help"></span>
+ </a>
{% if visitorData.nextVisitorId is not empty %}<a class="visitor-profile-next-visitor" href="#" title="{{ 'Live_NextVisitor'|translate }}">→</a>{% endif %}
</div>
<div class="visitor-profile-latest-visit">
diff --git a/plugins/Morpheus/fonts/piwik.eot b/plugins/Morpheus/fonts/piwik.eot
new file mode 100644
index 0000000000000000000000000000000000000000..bd41afad9edb7d1ea2aa18ac9b0b38e047a5082a
Binary files /dev/null and b/plugins/Morpheus/fonts/piwik.eot differ
diff --git a/plugins/Morpheus/fonts/piwik.ttf b/plugins/Morpheus/fonts/piwik.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..c81d69e10c28ed59c451ad46f2579a98e269dbb9
Binary files /dev/null and b/plugins/Morpheus/fonts/piwik.ttf differ
diff --git a/plugins/Morpheus/stylesheets/base.less b/plugins/Morpheus/stylesheets/base.less
index dba6565672e1d83a55040756d526b4fd3b3b1433..bf2bfd1749b3385ee1b793a4d63ec8d9dd709fab 100644
--- a/plugins/Morpheus/stylesheets/base.less
+++ b/plugins/Morpheus/stylesheets/base.less
@@ -5,6 +5,7 @@
@import "theme-advanced";
@import "base/mixins";
@import "base/bootstrap.css";
+@import "base/icons.css";
/* General styles */
@import "general/_default.less";
diff --git a/plugins/Morpheus/stylesheets/base/icons.css b/plugins/Morpheus/stylesheets/base/icons.css
new file mode 100644
index 0000000000000000000000000000000000000000..3424d8a65501d146980c2117e812250c0ccc2380
--- /dev/null
+++ b/plugins/Morpheus/stylesheets/base/icons.css
@@ -0,0 +1,238 @@
+@font-face {
+ font-family: 'piwik';
+ src: url('../../fonts/piwik.eot');
+}
+@font-face {
+ font-family: 'piwik';
+ src: url('../../fonts/piwik.ttf');
+ font-weight: normal;
+ font-style: normal;
+}
+
+[class^="icon-"], [class*=" icon-"] {
+ font-family: 'piwik';
+ speak: none;
+ font-style: normal;
+ font-weight: normal;
+ font-variant: normal;
+ text-transform: none;
+ line-height: 1;
+
+ /* Better Font Rendering =========== */
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-alien:before {
+ content: "\e600";
+}
+.icon-add:before {
+ content: "\e630";
+}
+.icon-annotation:before {
+ content: "\e601";
+}
+.icon-arrow-bottom:before {
+ content: "\e63b";
+}
+.icon-arrow-collapsed:before {
+ content: "\e60b";
+}
+.icon-arrow-left:before {
+ content: "\e602";
+}
+.icon-arrow-right:before {
+ content: "\e603";
+}
+.icon-arrow-top:before {
+ content: "\e63a";
+}
+.icon-business:before {
+ content: "\e604";
+}
+.icon-calendar:before {
+ content: "\e605";
+}
+.icon-chart-bar:before {
+ content: "\e606";
+}
+.icon-chart-line:before {
+ content: "\e608";
+}
+.icon-chart-line-details:before {
+ content: "\e607";
+}
+.icon-chart-pie:before {
+ content: "\e609";
+}
+.icon-close:before {
+ content: "\e60a";
+}
+.icon-code:before {
+ content: "\e620";
+}
+.icon-configure:before {
+ content: "\e60c";
+}
+.icon-delete:before {
+ content: "\e60f";
+}
+.icon-document:before {
+ content: "\e610";
+}
+.icon-download:before {
+ content: "\e611";
+}
+.icon-drop:before {
+ content: "\e612";
+}
+.icon-ecommerce-abandoned-cart:before {
+ content: "\e613";
+}
+.icon-ecommerce-order:before {
+ content: "\e614";
+}
+.icon-edit:before {
+ content: "\e622";
+}
+.icon-email:before {
+ content: "\e615";
+}
+.icon-error:before {
+ content: "\e616";
+}
+.icon-export:before {
+ content: "\e617";
+}
+.icon-feed:before {
+ content: "\e618";
+}
+.icon-finance:before {
+ content: "\e619";
+}
+.icon-folder:before {
+ content: "\e61b";
+}
+.icon-folder-charts:before {
+ content: "\e61a";
+}
+.icon-fullscreen:before {
+ content: "\e61c";
+}
+.icon-goal:before {
+ content: "\e61d";
+}
+.icon-help:before {
+ content: "\e61f";
+}
+.icon-help-alt:before {
+ content: "\e61e";
+}
+.icon-hide:before {
+ content: "\e638";
+}
+.icon-image:before {
+ content: "\e623";
+}
+.icon-info:before {
+ content: "\e624";
+}
+.icon-insights:before {
+ content: "\e625";
+}
+.icon-locked:before {
+ content: "\e627";
+}
+.icon-locked-2:before {
+ content: "\e626";
+}
+.icon-locked-3:before {
+ content: "\e628";
+}
+.icon-locked-4:before {
+ content: "\e629";
+}
+.icon-maximise:before {
+ content: "\e62a";
+}
+.icon-minimise:before {
+ content: "\e62b";
+}
+.icon-minus:before {
+ content: "\e62c";
+}
+.icon-newtab:before {
+ content: "\e62d";
+}
+.icon-ok:before {
+ content: "\e62e";
+}
+.icon-open-source:before {
+ content: "\e62f";
+}
+.icon-play:before {
+ content: "\e643";
+}
+.icon-plus:before {
+ content: "\e630";
+}
+.icon-puzzle:before {
+ content: "\e631";
+}
+.icon-refresh:before {
+ content: "\e632";
+}
+.icon-reload:before {
+ content: "\e633";
+}
+.icon-search:before {
+ content: "\e634";
+}
+.icon-segment:before {
+ content: "\e635";
+}
+.icon-server:before {
+ content: "\e637";
+}
+.icon-server-alt:before {
+ content: "\e636";
+}
+.icon-show:before {
+ content: "\e639";
+}
+.icon-star:before {
+ content: "\e63c";
+}
+.icon-success:before {
+ content: "\e63d";
+}
+.icon-table:before {
+ content: "\e63f";
+}
+.icon-table-more:before {
+ content: "\e63e";
+}
+.icon-tag-cloud:before {
+ content: "\e640";
+}
+.icon-user:before {
+ content: "\e642";
+}
+.icon-user-add:before {
+ content: "\e641";
+}
+.icon-users:before {
+ content: "\e635";
+}
+.icon-visitor-profile:before {
+ content: "\e644";
+}
+.icon-warning:before {
+ content: "\e621";
+}
+.icon-zoom-in:before {
+ content: "\e645";
+}
+.icon-zoom-out:before {
+ content: "\e646";
+}
diff --git a/plugins/Morpheus/stylesheets/general/_forms.less b/plugins/Morpheus/stylesheets/general/_forms.less
index a7a963b1a2b93c1fe15c553b828d12cfa70ae098..49c5358f1d02d687089f155f4e170a585b555377 100644
--- a/plugins/Morpheus/stylesheets/general/_forms.less
+++ b/plugins/Morpheus/stylesheets/general/_forms.less
@@ -89,14 +89,9 @@ select {
}
.form-help {
- .alert;
- .alert-info;
float: right;
width: 58%;
margin-bottom: 0;
- // Smaller padding to match input's heights
- padding-top: 11px;
- padding-bottom: 10px;
}
label .form-description {
@@ -120,6 +115,19 @@ select {
}
}
+// TODO Form helps are used outside of forms in UserCountry (old table layout)
+// Once this plugin uses the new form layout, move those rules back into ".form-group .form-help"
+.form-help {
+ .alert;
+ .alert-info;
+ // Smaller padding to match input's heights
+ padding: 11px 20px 10px;
+ &:before {
+ // Remove the icon
+ content: "";
+ }
+}
+
.form-description {
color: @theme-color-text-lighter;
font-style: italic;
diff --git a/plugins/Morpheus/stylesheets/general/_typography.less b/plugins/Morpheus/stylesheets/general/_typography.less
index 717f049189cc960ef08edfe8c2240f5efd2e800a..7c154787232b1605bc99f981d2af60adc17a9f0e 100644
--- a/plugins/Morpheus/stylesheets/general/_typography.less
+++ b/plugins/Morpheus/stylesheets/general/_typography.less
@@ -81,20 +81,10 @@ ul.widgetpreview-widgetlist, ul.widgetpreview-categorylist {
background: none !important;
}
-a#overlayTitle {
- color: #4d4d4d !important;
- .font-default(12px, 14px) !important;
- margin-left: 15px !important;
-}
-
a {
color: @theme-color-link;
}
-a.rowevolution-startmulti {
- color: @theme-color-link !important;
-}
-
.Piwik_Popover_Loading_Subject {
color: @theme-color-link !important;
}
diff --git a/plugins/Morpheus/stylesheets/main.less b/plugins/Morpheus/stylesheets/main.less
index 945ff6aeb5021b1fd8a8a1137fe477a108616758..f89c437fcef72e28605bc2293bd05eec68b1be10 100644
--- a/plugins/Morpheus/stylesheets/main.less
+++ b/plugins/Morpheus/stylesheets/main.less
@@ -874,13 +874,6 @@ tr:hover #token_auth {
background: #FFFFF7;
}
-table#users {
- .deleteuser:hover > span,
- .edituser:hover > span {
- text-decoration: underline;
- }
-}
-
// previous style overrides
#header_message a {
text-decoration: underline;
diff --git a/plugins/Morpheus/stylesheets/ui/_alerts.less b/plugins/Morpheus/stylesheets/ui/_alerts.less
index 2c95143d8501c16833f96f0186738d7ba2e442dc..0b6ceebf95609651083bbbe7aa92cbd849e74a8b 100644
--- a/plugins/Morpheus/stylesheets/ui/_alerts.less
+++ b/plugins/Morpheus/stylesheets/ui/_alerts.less
@@ -1,10 +1,28 @@
-// Code taken from Bootstrap (can be removed in the future)
+.alert-icon-center-vertically(@font-size) {
+ @half-height: @font-size / 2;
+ // IE8 doesn't support calc(): it's OK, the icon will just be aligned to the top
+ top: calc(~'50% - @{half-height}');
+ // phantomjs only supports -webkit-calc()
+ top: -webkit-calc(~'50% - @{half-height}');
+}
+
.alert {
- padding: 20px;
+ padding: 20px 20px 20px 60px;
margin-bottom: 20px;
border: 1px solid transparent;
border-radius: 2px;
font-size: 14px;
+ position: relative;
+ &:before {
+ font-family: "piwik";
+ content: "\e625";
+ position: absolute;
+ left: 20px;
+ line-height: 100%; // line-height = font-size
+ font-size: 24px;
+ .alert-icon-center-vertically(24px);
+ }
+
a {
color: inherit;
text-decoration: underline;
@@ -13,18 +31,36 @@
.alert-success {
color: #009874;
border-color: #1AA282;
+ &:before {
+ content: "\e63d";
+ color: #1AA282;
+ }
}
.alert-info {
color: #838383;
background-color: #F5F5F5;
font-size: 13px;
- padding: 15px 20px;
+ padding-top: 15px;
+ padding-bottom: 15px;
+ &:before {
+ color: #afafaf;
+ font-size: 20px;
+ .alert-icon-center-vertically(20px);
+ }
}
.alert-warning {
color: #CA8100;
border-color: #DF9D27;
+ &:before {
+ content: "\e621";
+ color: #DF9D27;
+ }
}
.alert-danger {
color: #D4291F;
border-color: #D73F36;
+ &:before {
+ content: "\e616";
+ color: #D73F36;
+ }
}
diff --git a/plugins/Morpheus/stylesheets/ui/_buttons.less b/plugins/Morpheus/stylesheets/ui/_buttons.less
index aac95e6dd1de8bbd595956f844203bf8007877e5..ce5417007d9ae02b468b3cacb95cd0eca99f6e4b 100644
--- a/plugins/Morpheus/stylesheets/ui/_buttons.less
+++ b/plugins/Morpheus/stylesheets/ui/_buttons.less
@@ -52,17 +52,30 @@ input[type="submit"]:not(.btn),
}
// See http://getbootstrap.com/css/#buttons-options
.btn.btn-link {
- // We have to use !important unfortunately because the default button style uses it...
- background: transparent !important;
- color: @theme-color-link !important;
- text-decoration: underline !important;
+ background: transparent;
+ color: @theme-color-link;
+ text-decoration: underline;
box-shadow: none;
}
.btn.btn-noop {
- // We have to use !important unfortunately because the default button style uses it...
- background: transparent !important;
- color: @theme-color-text !important;
+ background: transparent;
+ color: @theme-color-text;
pointer-events: none;
cursor: not-allowed;
box-shadow: none;
}
+
+.btn.btn-flat {
+ background: transparent;
+ border-radius: 0;
+ color: @theme-color-text-light;
+ box-shadow: none;
+ padding: 5px 10px;
+ &:hover {
+ background-color: #eaeaea;
+ text-decoration: none;
+ }
+ &.btn-lg {
+ padding: 12px;
+ }
+}
diff --git a/plugins/Morpheus/templates/demo.twig b/plugins/Morpheus/templates/demo.twig
index de1f4da8844d2692b10c99f86b85fdf36a4959a7..f95af42117564e2d2cffe95a3baccaec24058eae 100644
--- a/plugins/Morpheus/templates/demo.twig
+++ b/plugins/Morpheus/templates/demo.twig
@@ -46,6 +46,15 @@
border: 1px solid #e3e3e3;
border-radius: 4px;
}
+ .icons h4 {
+ padding-top: 15px;
+ padding-bottom: 10px;
+ }
+ .icons .icon {
+ font-family: monospace, monospace;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ }
</style>
{% endblock %}
@@ -186,6 +195,30 @@
<a class="btn btn-lg btn-block" href="#">Large block button</a></pre>
</div>
+ <h3>Link buttons</h3>
+
+ <div class="demo">
+ <a class="btn btn-link" href="#">Link button</a>
+ </div>
+ <div class="demo-code">
+ <pre><a class="btn btn-link" href="#">Flat button</a></pre>
+ </div>
+
+ <h3>Flat buttons</h3>
+
+ <div class="demo">
+ <a class="btn btn-flat" href="#">Flat button</a>
+ <a class="btn btn-flat" href="#"><span class="icon-add"></span></a>
+ <a class="btn btn-flat btn-lg" href="#">Flat button</a>
+ <a class="btn btn-flat btn-lg" href="#"><span class="icon-add"></span></a>
+ </div>
+ <div class="demo-code">
+ <pre><a class="btn btn-flat" href="#">Flat button</a>
+<a class="btn btn-flat" href="#"><span class="icon-add"></span></a>
+<a class="btn btn-flat btn-lg" href="#">Flat button</a>
+<a class="btn btn-flat btn-lg" href="#"><span class="icon-add"></span></a></pre>
+ </div>
+
<h2>Alerts</h2>
<div class="demo">
@@ -423,6 +456,137 @@
<pre><table>...</table></pre>
</div>
+ <h2>Icons</h2>
+
+ <div id="icons" class="demo icons">
+ </div>
+ <div class="demo-code">
+ <pre><span class="icon-ok"></span></pre>
+ </div>
+
+ <script>
+ $(function () {
+
+ var icons = {
+ 'Manage': [
+ 'add',
+ 'edit',
+ 'delete',
+ 'plus',
+ 'minus',
+ ],
+ 'Alerts': [
+ 'error',
+ 'warning',
+ 'info',
+ 'success',
+ 'help',
+ 'help-alt',
+ 'ok',
+ ],
+ 'Navigation': [
+ 'arrow-left',
+ 'arrow-right',
+ 'arrow-top',
+ 'arrow-bottom',
+ 'arrow-collapsed',
+ 'zoom-in',
+ 'zoom-out',
+ 'show',
+ 'hide',
+ 'search',
+ ],
+ 'Window-Widget': [
+ 'minimise',
+ 'fullscreen',
+ 'close',
+ 'maximise',
+ 'newtab',
+ 'refresh',
+ 'reload',
+ ],
+ 'Reports': [
+ 'table',
+ 'table-more',
+ 'chart-bar',
+ 'chart-pie',
+ 'chart-line',
+ 'chart-line-details',
+ ],
+ 'Users': [
+ 'user',
+ 'user-add',
+ 'users',
+ 'alien',
+ ],
+ 'Date-picker': [
+ 'calendar',
+ ],
+ 'Annotations': [
+ 'annotation',
+ ],
+ 'E-commerce': [
+ 'ecommerce-order',
+ 'ecommerce-abandoned-cart',
+ ],
+ 'Goals': [
+ 'goal',
+ ],
+ 'Insights': [
+ 'insights',
+ ],
+ 'Segments': [
+ 'segment',
+ ],
+ 'Visitors': [
+ 'visitor-profile',
+ ],
+ 'Lock': [
+ 'locked',
+ 'locked-2',
+ 'locked-3',
+ 'locked-4',
+ ],
+ 'Other': [
+ 'configure',
+ 'document',
+ 'email',
+ 'export',
+ 'feed',
+ 'download',
+ 'image',
+ 'code',
+ 'star',
+ 'drop',
+ 'business',
+ 'finance',
+ 'folder',
+ 'folder-charts',
+ 'open-source',
+ 'puzzle',
+ 'server',
+ 'server-alt',
+ 'tag-cloud',
+ 'play',
+ ],
+ };
+
+ var iconsDiv = $('#icons');
+ for(var category in icons) {
+ if (icons.hasOwnProperty(category)) {
+ iconsDiv.append('<h4>' + category + '</h4>');
+ var row = $('<div class="row"></div>');
+ icons[category].forEach(function(icon) {
+ icon = 'icon-' + icon;
+ row.append('<div class="col-sm-4 icon"><span class="' + icon + '"></span> ' + icon + '</div>');
+ });
+ iconsDiv.append(row);
+ }
+ }
+
+ });
+ </script>
+
</div>
{% endblock %}
diff --git a/plugins/Overlay/stylesheets/overlay.css b/plugins/Overlay/stylesheets/overlay.css
index f27e425b2159310d2fdabf82a5fea8db54ec9536..d3db1a5126361043561c009c030627f5a0f04acd 100644
--- a/plugins/Overlay/stylesheets/overlay.css
+++ b/plugins/Overlay/stylesheets/overlay.css
@@ -20,15 +20,12 @@ body #logo {
}
a#overlayTitle {
- font-size: 15px;
- font-weight: normal;
- color: #7e7363;
+ font-size: 12px;
text-decoration: none;
- vertical-align: text-bottom;
+ color: #4d4d4d;
+ margin-left: 15px;
}
-
-#overlayTitle img {
- vertical-align: text-bottom;
+a#overlayTitle .icon-help {
margin-left: 4px;
}
@@ -155,4 +152,4 @@ body .ui-tooltip.overlayTooltip {
.overlay-sidebar-container {
width: 220px;
-}
\ No newline at end of file
+}
diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig
index a5d21d36554a58bcd92bb1b672260fcef012ae6a..10a0b40d7617430ab41a0084d036c3e6a430fb47 100644
--- a/plugins/Overlay/templates/index.twig
+++ b/plugins/Overlay/templates/index.twig
@@ -8,9 +8,9 @@
{% block content %}
<div class="overlay-sidebar-container">
- <a id="overlayTitle" href="http://piwik.org/docs/page-overlay/" rel="noreferrer" target="_blank">
+ <a id="overlayTitle" href="http://piwik.org/docs/page-overlay/" rel="noreferrer" target="_blank">
{{ 'Overlay_Overlay'|translate }}
- <img src="plugins/Morpheus/images/help.png" alt="Documentation"/>
+ <span class="icon-help"></span>
</a>
<div id="overlayDateRangeSelection">
diff --git a/plugins/ScheduledReports/javascripts/pdf.js b/plugins/ScheduledReports/javascripts/pdf.js
index 126f956adff67a687f19337af1322df0b22d25ae..2b86809517de5d5bcf477c890f3b19dd7102c2cf 100644
--- a/plugins/ScheduledReports/javascripts/pdf.js
+++ b/plugins/ScheduledReports/javascripts/pdf.js
@@ -155,7 +155,7 @@ function initManagePdf() {
});
// Delete Report
- $('a[name=linkDeleteReport]').click(function () {
+ $('.delete-report').click(function () {
var idReport = $(this).attr('id');
function onDelete() {
@@ -173,7 +173,7 @@ function initManagePdf() {
});
// Edit Report click
- $('a[name=linkEditReport]').click(function () {
+ $('.edit-report').click(function () {
var idReport = $(this).attr('id');
formSetEditReport(idReport);
$('.entityAddContainer').show();
@@ -188,7 +188,7 @@ function initManagePdf() {
});
// Add a Report click
- $('#linkAddReport').click(function () {
+ $('#add-report').click(function () {
$('.entityAddContainer').show();
$('#entityEditContainer').hide();
formSetEditReport(/*idReport = */0);
diff --git a/plugins/ScheduledReports/templates/_listReports.twig b/plugins/ScheduledReports/templates/_listReports.twig
index 72b6698fcbbcf4110b1b0dbde0e14eebac868add..12dc5dd78527f2a34aa488c17350c1374f180cd5 100644
--- a/plugins/ScheduledReports/templates/_listReports.twig
+++ b/plugins/ScheduledReports/templates/_listReports.twig
@@ -76,30 +76,29 @@
{{ 'General_Download'|translate }}
</a>
</td>
- <td>
- {# edit link #}
- <a href='#' name="linkEditReport" id="{{ report.idreport }}" class="link_but withIcon">
- <img src='plugins/Morpheus/images/ico_edit.png' border="0"/>
- {{ 'General_Edit'|translate }}
- </a>
+ <td class="text-center">
+ <button id="{{ report.idreport }}" class="edit-report btn btn-flat btn-lg" title="{{ 'General_Edit'|translate }}">
+ <span class="icon-edit"></span>
+ </button>
</td>
- <td>
- {# delete link #}
- <a href='#' name="linkDeleteReport" id="{{ report.idreport }}" class="link_but withIcon">
- <img src='plugins/Morpheus/images/ico_delete.png' border="0"/>
- {{ 'General_Delete'|translate }}
- </a>
+ <td class="text-center">
+ <button id="{{ report.idreport }}" class="delete-report btn btn-flat btn-lg" title="{{ 'General_Delete'|translate }}">
+ <span class="icon-delete"></span>
+ </button>
</td>
</tr>
{% endfor %}
{% endif %}
</table>
+
{% if userLogin != 'anonymous' %}
- <br/>
- <div id='linkAddReport' class="addrow"><img src='plugins/Morpheus/images/add.png'/> {{ 'ScheduledReports_CreateAndScheduleReport'|translate }}</div>
- <br/>
- <br/>
+ <p>
+ <button id="add-report" class="btn btn-lg btn-flat">
+ <span class="icon-add"></span>
+ {{ 'ScheduledReports_CreateAndScheduleReport'|translate }}
+ </button>
+ </p>
{% endif %}
</div>
diff --git a/plugins/ScheduledReports/templates/index.twig b/plugins/ScheduledReports/templates/index.twig
index 89065c5d90179cd43172d9d58cc83e4632755e21..09539ef8cd9b7c8f9333402146f9a41c8db7bd32 100644
--- a/plugins/ScheduledReports/templates/index.twig
+++ b/plugins/ScheduledReports/templates/index.twig
@@ -54,14 +54,6 @@
position:relative;
}
- #linkAddReport {
- margin-top: 0px;
- }
-
- #linkAddReport:hover {
- text-decoration: underline;
- }
-
.emailReports .top_controls {
padding-bottom: 18px;
}
diff --git a/plugins/SitesManager/templates/sites-list/site-fields.html b/plugins/SitesManager/templates/sites-list/site-fields.html
index 7e56b1623dee777d897ca13bc452cca0b59e56bd..888d9f7b1fdf6ebd3109a0d5ca9f874ba9c16177 100644
--- a/plugins/SitesManager/templates/sites-list/site-fields.html
+++ b/plugins/SitesManager/templates/sites-list/site-fields.html
@@ -7,9 +7,15 @@
<ul>
<li><span class="title">{{ 'General_Id'|translate }}:</span> {{ site.idsite }}</li>
<li ng-show="availableTypes.length > 1"><span class="title">Type:</span> {{ currentType.name }}</li>
+ <li ng-show="site.idsite && howToSetupUrl">
+ <a target="{{ isInternalSetupUrl ? '_self' : '_blank' }}" title="{{ 'SitesManager_ShowTrackingTag'|translate }}"
+ ng-href="{{ howToSetupUrl }}{{ isInternalSetupUrl ? '&idSite=' + site.idsite + '&period=' + period + '&date=' + date +'&updated=false' : ''}}">
+ {{ 'SitesManager_ShowTrackingTag'|translate }}
+ </a>
+ </li>
</ul>
</div>
- <div class="col-md-3">
+ <div class="col-md-4">
<ul>
<li><span class="title">{{ 'SitesManager_Timezone'|translate }}:</span> {{ site.timezone }}</li>
<li><span class="title">{{ 'SitesManager_Currency'|translate }}:</span> {{ site.currency }}</li>
@@ -41,23 +47,17 @@
</li>
</ul>
</div>
- <div class="col-md-2 text-right">
+ <div class="col-md-1 text-right">
<ul>
<li>
- <span class="link_but" ng-click="editSite()">
- <img src='plugins/Morpheus/images/ico_edit.png' title="{{ 'General_Edit'|translate }}"/>
- Edit
- </span>
+ <button class="btn btn-flat btn-lg" ng-click="editSite()" title="{{ 'General_Edit'|translate }}">
+ <span class="icon-edit"></span>
+ </button>
</li>
<li>
- <span ng-show="site.idsite" class="link_but" ng-click="openDeleteDialog()">
- <img src='plugins/Morpheus/images/ico_delete.png' title="{{ 'General_Delete'|translate }}"/>
- Delete
- </span>
- </li>
- <li ng-show="site.idsite && howToSetupUrl">
- <a target="{{ isInternalSetupUrl ? '_self' : '_blank' }}" ng-href="{{ howToSetupUrl }}{{ isInternalSetupUrl ? '&idSite=' + site.idsite + '&period=' + period + '&date=' + date +'&updated=false' : ''}}">
- {{ 'SitesManager_ShowTrackingTag'|translate }}</a>
+ <button class="btn btn-flat btn-lg" ng-show="site.idsite" ng-click="openDeleteDialog()" title="{{ 'General_Delete'|translate }}">
+ <span class="icon-delete"></span>
+ </button>
</li>
</ul>
</div>
@@ -141,4 +141,4 @@
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/UserCountry/templates/_updaterManage.twig b/plugins/UserCountry/templates/_updaterManage.twig
index 26aadd803205e81c9c776f53d324ce213be39a35..4f614787f13a5fe228009efdfcdd9e7c3fe048ac 100755
--- a/plugins/UserCountry/templates/_updaterManage.twig
+++ b/plugins/UserCountry/templates/_updaterManage.twig
@@ -17,7 +17,7 @@
<td width="150">{{ 'UserCountry_LocationDatabase'|translate }}</td>
<td><input type="text" id="geoip-location-db" value="{{ geoIPLocUrl }}"/></td>
<td width="164">
- <div class="alert alert-info">
+ <div class="form-help">
{{ 'UserCountry_LocationDatabaseHint'|translate }}
</div>
</td>
@@ -40,7 +40,7 @@
<label for="geoip-update-period-week">{{ 'Intl_PeriodWeek'|translate }}</label>
</td>
<td width="164">
- <div class="alert alert-info">
+ <div class="form-help">
{% if lastTimeUpdaterRun is defined and lastTimeUpdaterRun is not empty %}
{{ 'UserCountry_UpdaterWasLastRun'|translate(lastTimeUpdaterRun)|raw }}
{% else %}
diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
index fe729a449735c439441ee35ede494eb3d4d41763..fed5874b53c0f3462bd0df50072b4cc620cf10b7 100755
--- a/plugins/UserCountry/templates/adminIndex.twig
+++ b/plugins/UserCountry/templates/adminIndex.twig
@@ -60,7 +60,7 @@
</td>
<td width="164">
{% if provider.status == 1 %}
- <div class="alert alert-info">
+ <div class="form-help">
{% if thisIP != '127.0.0.1' %}
{{ 'UserCountry_CurrentLocationIntro'|translate }}:
<div>
@@ -78,12 +78,12 @@
</div>
{% endif %}
{% if provider.statusMessage is defined and provider.statusMessage %}
- <div class="alert alert-info">
+ <div class="form-help">
{% if provider.status == 2 %}<strong>{{ 'General_Error'|translate }}:</strong> {% endif %}{{ provider.statusMessage|raw }}
</div>
{% endif %}
{% if provider.extra_message is defined and provider.extra_message %}
- <div class="alert alert-info">
+ <div class="form-help">
{{ provider.extra_message|raw }}
</div>
{% endif %}
diff --git a/plugins/UsersManager/javascripts/usersManager.js b/plugins/UsersManager/javascripts/usersManager.js
index 4d9c9269419ac381b1a38c34b7ace4444e1d4266..c0aaeb9bf2fa1569cb581b5f81cb700c8964e4a6 100644
--- a/plugins/UsersManager/javascripts/usersManager.js
+++ b/plugins/UsersManager/javascripts/usersManager.js
@@ -263,7 +263,7 @@ $(document).ready(function () {
}
);
- $('.admin .user .addrow').click(function () {
+ $('.admin .user .add-user').click(function () {
piwikHelper.hideAjaxError();
$(this).toggle();
@@ -288,7 +288,7 @@ $(document).ready(function () {
$('.cancel').click(function () {
piwikHelper.hideAjaxError();
$(this).parents('tr').remove();
- $('.addrow').toggle();
+ $('.add-user').toggle();
});
});
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index 6e40ef53e95e05f05b0402bd276df547f1428069..f3ae34af9c692184b2c6d1db252b34d108779ad6 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -142,24 +142,27 @@
{% if user.last_seen is defined %}
<td id="last_seen">{% if user.last_seen is empty %}-{% else %}{{ 'General_TimeAgo'|translate(user.last_seen)|raw }}{% endif %}</td>
{% endif %}
- <td>
- <span class="edituser link_but" id="row{{ i }}">
- <img title="{{ 'General_Edit'|translate }}" src='plugins/Morpheus/images/ico_edit.png'/>
- <span>{{ 'General_Edit'|translate }}</span>
- </span>
+ <td class="text-center">
+ <button class="edituser btn btn-flat" id="row{{ i }}" title="{{ 'General_Edit'|translate }}">
+ <span class="icon-edit"></span>
+ </button>
</td>
- <td>
- <span class="deleteuser link_but" id="row{{ i }}">
- <img title="{{ 'General_Delete'|translate }}" src='plugins/Morpheus/images/ico_delete.png'/>
- <span>{{ 'General_Delete'|translate }}</span>
- </span>
+ <td class="text-center">
+ <button class="deleteuser btn btn-flat" id="row{{ i }}" title="{{ 'General_Delete'|translate }}">
+ <span class="icon-delete"></span>
+ </button>
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>
- <div class="addrow"><img src='plugins/Morpheus/images/add.png'/> {{ 'UsersManager_AddUser'|translate }}</div>
+ <p>
+ <button class="add-user btn btn-lg btn-flat">
+ <span class="icon-add"></span>
+ {{ 'UsersManager_AddUser'|translate }}
+ </button>
+ </p>
</div>
<h2 id="super_user_access">{{ 'UsersManager_SuperUserAccessManagement'|translate }}</h2>
diff --git a/tests/UI/specs/RowEvolution_spec.js b/tests/UI/specs/RowEvolution_spec.js
index 9214ee69b6c12b966f7f956f5e1aa9f899199248..c6942fd71422757d36ee994868e9a040db9f06dd 100644
--- a/tests/UI/specs/RowEvolution_spec.js
+++ b/tests/UI/specs/RowEvolution_spec.js
@@ -39,7 +39,7 @@ describe("RowEvolution", function () {
it('should load multi-row evolution correctly', function (done) {
expect.screenshot('multirow_evolution').to.be.captureSelector('.ui-dialog', function (page) {
- page.click('a.rowevolution-startmulti');
+ page.click('.rowevolution-startmulti');
page.mouseMove('tbody tr:nth-child(2)');
page.mouseMove('a.actionRowEvolution:visible');
page.click('a.actionRowEvolution:visible');
@@ -62,4 +62,4 @@ describe("RowEvolution", function () {
page.click('a.actionRowEvolution:visible');
}, done);
});
-});
\ No newline at end of file
+});