diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-23 02:01:04 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-23 02:01:04 +0400 |
| commit | 63b596a9044825185e0eeac1974e21dccac9967c (patch) | |
| tree | 9a09fa9b4396af54f146b409d2a40ee219b6bcde /plugins | |
| parent | 99d70f99068b110b33eafb09946769e3b0be6811 (diff) | |
started experiment making morpheus default theme
Diffstat (limited to 'plugins')
148 files changed, 180 insertions, 179 deletions
diff --git a/plugins/Actions/javascripts/actionsDataTable.js b/plugins/Actions/javascripts/actionsDataTable.js index 209c33093f..50adb80d15 100644 --- a/plugins/Actions/javascripts/actionsDataTable.js +++ b/plugins/Actions/javascripts/actionsDataTable.js @@ -26,12 +26,12 @@ // helper function for ActionDataTable function setImageMinus(domElem) { - $('img.plusMinus', domElem).attr('src', 'plugins/Zeitgeist/images/minus.png'); + $('img.plusMinus', domElem).attr('src', 'plugins/Morpheus/images/minus.png'); } // helper function for ActionDataTable function setImagePlus(domElem) { - $('img.plusMinus', domElem).attr('src', 'plugins/Zeitgeist/images/plus.png'); + $('img.plusMinus', domElem).attr('src', 'plugins/Morpheus/images/plus.png'); } /** @@ -181,7 +181,7 @@ $(domElem).after('\ <tr id="' + divIdToReplaceWithSubTable + '" class="cellSubDataTable">\ <td colspan="' + numberOfColumns + '">\ - <span class="loadingPiwik" style="display:inline"><img src="plugins/Zeitgeist/images/loading-blue.gif" /> Loading...</span>\ + <span class="loadingPiwik" style="display:inline"><img src="plugins/Morpheus/images/loading-blue.gif" /> Loading...</span>\ </td>\ </tr>\ '); diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js index 4aac660f59..f25a993833 100755 --- a/plugins/Annotations/javascripts/annotations.js +++ b/plugins/Annotations/javascripts/annotations.js @@ -460,9 +460,9 @@ // modify the starred count & make sure the correct image is used var newStarCount = starredCount + starAmt; if (newStarCount > 0) { - var newImg = 'plugins/Zeitgeist/images/annotations_starred.png'; + var newImg = 'plugins/Morpheus/images/annotations_starred.png'; } else { - var newImg = 'plugins/Zeitgeist/images/annotations.png'; + var newImg = 'plugins/Morpheus/images/annotations.png'; } $(this).attr('data-starred', newStarCount).find('img').attr('src', newImg); diff --git a/plugins/Annotations/templates/_annotation.twig b/plugins/Annotations/templates/_annotation.twig index ee2e64046f..b021eb578c 100755 --- a/plugins/Annotations/templates/_annotation.twig +++ b/plugins/Annotations/templates/_annotation.twig @@ -3,9 +3,9 @@ <div class="annotation-star{% if annotation.canEditOrDelete %} annotation-star-changeable{% endif %}" data-starred="{{ annotation.starred }}" {% if annotation.canEditOrDelete %}title="{{ 'Annotations_ClickToStarOrUnstar'|translate }}"{% endif %}> {% if annotation.starred %} - <img src="plugins/Zeitgeist/images/star.png"/> + <img src="plugins/Morpheus/images/star.png"/> {% else %} - <img src="plugins/Zeitgeist/images/star_empty.png"/> + <img src="plugins/Morpheus/images/star_empty.png"/> {% endif %} </div> <div class="annotation-period {% if annotation.canEditOrDelete %}annotation-enter-edit-mode{% endif %}">({{ annotation.date }})</div> diff --git a/plugins/Annotations/templates/getAnnotationManager.twig b/plugins/Annotations/templates/getAnnotationManager.twig index 0cb594426e..e700e2cc5d 100755 --- a/plugins/Annotations/templates/getAnnotationManager.twig +++ b/plugins/Annotations/templates/getAnnotationManager.twig @@ -12,7 +12,7 @@ <div class="annotation-list"> {% include "@Annotations/_annotationList.twig" %} - <span class="loadingPiwik" style="display:none;"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading'|translate }}</span> + <span class="loadingPiwik" style="display:none;"><img src="plugins/Morpheus/images/loading-blue.gif"/>{{ 'General_Loading'|translate }}</span> </div> diff --git a/plugins/Annotations/templates/getEvolutionIcons.twig b/plugins/Annotations/templates/getEvolutionIcons.twig index b9955599a3..1c0e441137 100755 --- a/plugins/Annotations/templates/getEvolutionIcons.twig +++ b/plugins/Annotations/templates/getEvolutionIcons.twig @@ -8,7 +8,7 @@ counts.note)|raw }} {{ 'Annotations_ClickToEditOrAdd'|translate }}" {% else %}}title="{{ 'Annotations_ViewAndAddAnnotations'|translate(date) }}"{% endif %}> - <img src="plugins/Zeitgeist/images/{% if counts.starred > 0 %}annotations_starred.png{% else %}annotations.png{% endif %}" width="16" height="16"/> + <img src="plugins/Morpheus/images/{% if counts.starred > 0 %}annotations_starred.png{% else %}annotations.png{% endif %}" width="16" height="16"/> </span> {% endfor %} </div> diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php index f750f449b2..658c0a5c60 100644 --- a/plugins/CoreAdminHome/CoreAdminHome.php +++ b/plugins/CoreAdminHome/CoreAdminHome.php @@ -67,6 +67,7 @@ class CoreAdminHome extends \Piwik\Plugin $stylesheets[] = "libs/jquery/themes/base/jquery-ui.css"; $stylesheets[] = "plugins/CoreAdminHome/stylesheets/menu.less"; $stylesheets[] = "plugins/Zeitgeist/stylesheets/base.less"; + $stylesheets[] = "plugins/Morpheus/stylesheets/theme.less"; $stylesheets[] = "plugins/CoreAdminHome/stylesheets/generalSettings.less"; $stylesheets[] = "plugins/CoreAdminHome/stylesheets/pluginSettings.less"; } @@ -77,8 +78,8 @@ class CoreAdminHome extends \Piwik\Plugin $jsFiles[] = "libs/jquery/jquery-ui.js"; $jsFiles[] = "libs/jquery/jquery.browser.js"; $jsFiles[] = "libs/javascript/sprintf.js"; - $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js"; - $jsFiles[] = "plugins/Zeitgeist/javascripts/ajaxHelper.js"; + $jsFiles[] = "plugins/Morpheus/javascripts/piwikHelper.js"; + $jsFiles[] = "plugins/Morpheus/javascripts/ajaxHelper.js"; $jsFiles[] = "libs/jquery/jquery.history.js"; $jsFiles[] = "plugins/CoreHome/javascripts/broadcast.js"; $jsFiles[] = "plugins/CoreAdminHome/javascripts/generalSettings.js"; diff --git a/plugins/CoreAdminHome/CustomLogo.php b/plugins/CoreAdminHome/CustomLogo.php index 7f543973c3..b4f6884793 100644 --- a/plugins/CoreAdminHome/CustomLogo.php +++ b/plugins/CoreAdminHome/CustomLogo.php @@ -21,7 +21,7 @@ class CustomLogo public function getLogoUrl($pathOnly = false) { - $defaultLogo = 'plugins/Zeitgeist/images/logo.png'; + $defaultLogo = 'plugins/Morpheus/images/logo.png'; $themeLogo = 'plugins/%s/images/logo.png'; $userLogo = CustomLogo::getPathUserLogo(); return $this->getPathToLogo($pathOnly, $defaultLogo, $themeLogo, $userLogo); @@ -29,7 +29,7 @@ class CustomLogo public function getHeaderLogoUrl($pathOnly = false) { - $defaultLogo = 'plugins/Zeitgeist/images/logo-header.png'; + $defaultLogo = 'plugins/Morpheus/images/logo-header.png'; $themeLogo = 'plugins/%s/images/logo-header.png'; $customLogo = CustomLogo::getPathUserLogoSmall(); return $this->getPathToLogo($pathOnly, $defaultLogo, $themeLogo, $customLogo); @@ -37,7 +37,7 @@ class CustomLogo public function getSVGLogoUrl($pathOnly = false) { - $defaultLogo = 'plugins/Zeitgeist/images/logo.svg'; + $defaultLogo = 'plugins/Morpheus/images/logo.svg'; $themeLogo = 'plugins/%s/images/logo.svg'; $customLogo = CustomLogo::getPathUserSvgLogo(); $svg = $this->getPathToLogo($pathOnly, $defaultLogo, $themeLogo, $customLogo); diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index bdf580a8b6..3c08bc274d 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -43,6 +43,7 @@ class CoreHome extends \Piwik\Plugin $stylesheets[] = "libs/jquery/stylesheets/jquery.jscrollpane.css"; $stylesheets[] = "libs/jquery/stylesheets/scroll.less"; $stylesheets[] = "plugins/Zeitgeist/stylesheets/base.less"; + $stylesheets[] = "plugins/Morpheus/stylesheets/theme.less"; $stylesheets[] = "plugins/CoreHome/stylesheets/coreHome.less"; $stylesheets[] = "plugins/CoreHome/stylesheets/menu.less"; $stylesheets[] = "plugins/CoreHome/stylesheets/dataTable.less"; @@ -75,8 +76,8 @@ class CoreHome extends \Piwik\Plugin $jsFiles[] = "libs/angularjs/angular-sanitize.min.js"; $jsFiles[] = "libs/angularjs/angular-animate.min.js"; $jsFiles[] = "libs/angularjs/angular-cookies.min.js"; - $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js"; - $jsFiles[] = "plugins/Zeitgeist/javascripts/ajaxHelper.js"; + $jsFiles[] = "plugins/Morpheus/javascripts/piwikHelper.js"; + $jsFiles[] = "plugins/Morpheus/javascripts/ajaxHelper.js"; $jsFiles[] = "plugins/CoreHome/javascripts/require.js"; $jsFiles[] = "plugins/CoreHome/javascripts/uiControl.js"; $jsFiles[] = "plugins/CoreHome/javascripts/dataTable.js"; diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.less b/plugins/CoreHome/angularjs/siteselector/siteselector.less index c8b78ca415..0fa94fb033 100644 --- a/plugins/CoreHome/angularjs/siteselector/siteselector.less +++ b/plugins/CoreHome/angularjs/siteselector/siteselector.less @@ -36,7 +36,7 @@ float: left; position: relative; z-index: 19; - background: #fff url(plugins/Zeitgeist/images/sites_selection.png) repeat-x 0 0; + background: #fff url(plugins/Morpheus/images/sites_selection.png) repeat-x 0 0; border: 1px solid #d4d4d4; color: #255792; border-radius: 4px; @@ -79,7 +79,7 @@ } .sites_autocomplete .custom_select_main_link.loading { - background: url(plugins/Zeitgeist/images/loading-blue.gif) no-repeat right 3px; + background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat right 3px; } .sites_autocomplete .custom_select_ul_list, @@ -113,7 +113,7 @@ height: 26px; display: block; white-space: nowrap; - background: url(plugins/Zeitgeist/images/search_bg.png) no-repeat 0 0; + background: url(plugins/Morpheus/images/search_bg.png) no-repeat 0 0; } .sites_autocomplete .custom_select_search .inp { diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 6c7f37620f..f3557874f0 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -1452,7 +1452,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { '<tr>' + '<td colspan="' + numberOfColumns + '" class="cellSubDataTable">' + '<div id="' + divIdToReplaceWithSubTable + '">' + - '<span class="loadingPiwik" style="display:inline"><img src="plugins/Zeitgeist/images/loading-blue.gif" />' + _pk_translate('General_Loading') + '</span>' + + '<span class="loadingPiwik" style="display:inline"><img src="plugins/Morpheus/images/loading-blue.gif" />' + _pk_translate('General_Loading') + '</span>' + '</div>' + '</td>' + '</tr>' diff --git a/plugins/CoreHome/javascripts/dataTable_rowactions.js b/plugins/CoreHome/javascripts/dataTable_rowactions.js index 2325fdedb5..37b6d31ec2 100644 --- a/plugins/CoreHome/javascripts/dataTable_rowactions.js +++ b/plugins/CoreHome/javascripts/dataTable_rowactions.js @@ -59,8 +59,8 @@ DataTable_RowActions_Registry.register({ name: 'RowEvolution', - dataTableIcon: 'plugins/Zeitgeist/images/row_evolution.png', - dataTableIconHover: 'plugins/Zeitgeist/images/row_evolution_hover.png', + dataTableIcon: 'plugins/Morpheus/images/row_evolution.png', + dataTableIconHover: 'plugins/Morpheus/images/row_evolution_hover.png', order: 50, diff --git a/plugins/CoreHome/javascripts/donate.js b/plugins/CoreHome/javascripts/donate.js index 5d5fdeb33f..91a47e3d75 100755 --- a/plugins/CoreHome/javascripts/donate.js +++ b/plugins/CoreHome/javascripts/donate.js @@ -27,7 +27,7 @@ $('.slider-donate-amount', slider).text('$' + donateAmounts[pos] + '/' + _pk_translate('General_YearShort')); // set the right smiley face - $('.slider-smiley-face').attr('src', 'plugins/Zeitgeist/images/smileyprog_' + pos + '.png'); + $('.slider-smiley-face').attr('src', 'plugins/Morpheus/images/smileyprog_' + pos + '.png'); // set the hidden option input for paypal var option = Math.max(1, pos); diff --git a/plugins/CoreHome/stylesheets/coreHome.less b/plugins/CoreHome/stylesheets/coreHome.less index ea2e0b228f..5d659b90ea 100644 --- a/plugins/CoreHome/stylesheets/coreHome.less +++ b/plugins/CoreHome/stylesheets/coreHome.less @@ -154,7 +154,7 @@ div.pk-emptyGraph { line-height: 20px; font-weight: normal; text-align: center; - background: url(plugins/Zeitgeist/images/loading-blue.gif) no-repeat center 20px; + background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat center 20px; } .Piwik_Popover_Loading_NameWithSubject { diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less index b874a4167b..1cc9bf1872 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less +++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less @@ -202,7 +202,7 @@ table.dataTable img { height: 20px; display: block; white-space: nowrap; - background: url(plugins/Zeitgeist/images/search_bg.png) no-repeat center 0; + background: url(plugins/Morpheus/images/search_bg.png) no-repeat center 0; text-align: center; } diff --git a/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less b/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less index 6d899d89ef..327d74b243 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less +++ b/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less @@ -13,7 +13,7 @@ .limitSelection > div { border: 1px solid #DFDFDF; border-radius: 4px; - background: url(plugins/Zeitgeist/images/sort_subtable_desc_light.png) no-repeat right 2px; + background: url(plugins/Morpheus/images/sort_subtable_desc_light.png) no-repeat right 2px; padding: 0 14px 0 4px; display: block; width: 24px; @@ -29,7 +29,7 @@ .limitSelection.visible > div { border-radius: 0 0 4px 4px; - background-image: url(plugins/Zeitgeist/images/sort_subtable_asc_light.png) + background-image: url(plugins/Morpheus/images/sort_subtable_asc_light.png) } .limitSelection > ul { diff --git a/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less b/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less index 556c0051da..c7c39b87e4 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less +++ b/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less @@ -17,7 +17,7 @@ table.dataTable th .columnDocumentation { } table.dataTable th .columnDocumentationTitle { - background: url(plugins/Zeitgeist/images/help.png) no-repeat; + background: url(plugins/Morpheus/images/help.png) no-repeat; line-height: 14px; padding: 2px 0 3px 21px; font-weight: bold; @@ -47,7 +47,7 @@ table.dataTable th .columnDocumentationTitle { width: 16px; height: 16px; margin: 10px 0; - background: url(plugins/Zeitgeist/images/help.png) no-repeat; + background: url(plugins/Morpheus/images/help.png) no-repeat; } h2 .reportDocumentationIcon { diff --git a/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less b/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less index a9d3073c64..5f675894d3 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less +++ b/plugins/CoreHome/stylesheets/dataTable/_tableConfiguration.less @@ -10,7 +10,7 @@ a.tableConfigurationIcon { display: block; width: 30px; height: 22px; - background: url(plugins/Zeitgeist/images/configure.png) no-repeat center 2px; + background: url(plugins/Morpheus/images/configure.png) no-repeat center 2px; position: absolute; z-index: 9; right: 0; @@ -20,7 +20,7 @@ a.tableConfigurationIcon.highlighted { display: block; width: 30px; height: 22px; - background-image: url(plugins/Zeitgeist/images/configure-highlight.png); + background-image: url(plugins/Morpheus/images/configure-highlight.png); position: absolute; z-index: 9; right: 0; diff --git a/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig index ef939fe3a1..57ec8279d5 100644 --- a/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig +++ b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig @@ -19,7 +19,7 @@ <div style="float:left;max-width:900px;"> <div class="loadingPiwik" style="display:none;"> - <img src="plugins/Zeitgeist/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }} + <img src="plugins/Morpheus/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }} </div> <div class="dimensionReport">{{ firstReport|raw }}</div> diff --git a/plugins/CoreHome/templates/_dataTableCell.twig b/plugins/CoreHome/templates/_dataTableCell.twig index 93331ddab0..cff58d705e 100644 --- a/plugins/CoreHome/templates/_dataTableCell.twig +++ b/plugins/CoreHome/templates/_dataTableCell.twig @@ -4,7 +4,7 @@ {% if not row.getIdSubDataTable() and column=='label' and row.getMetadata('url') %} <a target="_blank" href='{% if row.getMetadata('url')|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.getMetadata('url')|raw }}'> {% if not row.getMetadata('logo') %} - <img class="link" width="10" height="9" src="plugins/Zeitgeist/images/link.gif"/> + <img class="link" width="10" height="9" src="plugins/Morpheus/images/link.gif"/> {% endif %} {% endif %} {% if column=='label' %} diff --git a/plugins/CoreHome/templates/_dataTableFooter.twig b/plugins/CoreHome/templates/_dataTableFooter.twig index ecfb83a5e1..4c0a588487 100644 --- a/plugins/CoreHome/templates/_dataTableFooter.twig +++ b/plugins/CoreHome/templates/_dataTableFooter.twig @@ -22,7 +22,7 @@ {% endif %} </div> - <span class="loadingPiwik" style="display:none;"><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> + <span class="loadingPiwik" style="display:none;"><img src="plugins/Morpheus/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> {% if properties.show_footer_icons %} <div class="dataTableFooterIcons"> @@ -33,7 +33,7 @@ {% for footerIcon in footerIconGroup.buttons %} <span> {% if properties.show_active_view_icon and clientSideParameters.viewDataTable == footerIcon.id %} - <img src="plugins/Zeitgeist/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/> + <img src="plugins/Morpheus/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/> {% endif %} <a class="tableIcon {% if clientSideParameters.viewDataTable == footerIcon.id %}activeIcon{% endif %}" data-footer-icon-id="{{ footerIcon.id }}"> <img width="16" height="16" title="{{ footerIcon.title }}" src="{{ footerIcon.icon }}"/> @@ -46,11 +46,11 @@ {% endfor %} <div class="tableIconsGroup"> {% if footerIcons is empty %} - <img src="plugins/Zeitgeist/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/> + <img src="plugins/Morpheus/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/> {% endif %} <span class="exportToFormatIcons"> <a class="tableIcon" var="export"> - <img width="16" height="16" src="plugins/Zeitgeist/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/> + <img width="16" height="16" src="plugins/Morpheus/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/> </a> </span> <span class="exportToFormatItems" style="display:none;"> @@ -63,14 +63,14 @@ {% if properties.show_export_as_rss_feed %} | <a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="RSS" filter_limit="{{ properties.export_limit }}" date="last10"> - <img border="0" src="plugins/Zeitgeist/images/feed.png"/> + <img border="0" src="plugins/Morpheus/images/feed.png"/> </a> {% endif %} </span> {% if properties.show_export_as_image_icon %} <span id="dataTableFooterExportAsImageIcon"> <a class="tableIcon" href="#" onclick="$(this).closest('.dataTable').find('div.jqplot-target').trigger('piwikExportAsImage'); return false;"> - <img title="{{ 'General_ExportAsImage'|translate }}" src="plugins/Zeitgeist/images/image.png"/> + <img title="{{ 'General_ExportAsImage'|translate }}" src="plugins/Morpheus/images/image.png"/> </a> </span> {% endif %} @@ -102,7 +102,7 @@ {% if isPluginLoaded('Annotations') and not properties.hide_annotations_view %} <div class="annotationView" title="{{ 'Annotations_IconDesc'|translate }}"> <a class="tableIcon"> - <img width="16" height="16" src="plugins/Zeitgeist/images/annotations.png"/> + <img width="16" height="16" src="plugins/Morpheus/images/annotations.png"/> </a> <span>{{ 'Annotations_Annotations'|translate }}</span> </div> @@ -135,6 +135,6 @@ </div> -<span class="loadingPiwikBelow" style="display:none;"><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> +<span class="loadingPiwikBelow" style="display:none;"><img src="plugins/Morpheus/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> <div class="dataTableSpacer"></div> diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig index 3140999fed..1fff9d4015 100755 --- a/plugins/CoreHome/templates/_donate.twig +++ b/plugins/CoreHome/templates/_donate.twig @@ -26,14 +26,14 @@ <div style="display:inline-block;"> <div class="slider-donate-amount">$30/{{ 'General_YearShort'|translate }}</div> - <img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/images/smileyprog_1.png"/> + <img class="slider-smiley-face" width="40" height="40" src="plugins/Morpheus/images/smileyprog_1.png"/> </div> <input type="hidden" name="os0" value="Option 1"/> </div> <div class="donate-submit"> - <input type="image" src="plugins/Zeitgeist/images/paypal_subscribe.gif" border="0" name="submit" + <input type="image" src="plugins/Morpheus/images/paypal_subscribe.gif" border="0" name="submit" title="{{ 'CoreHome_SubscribeAndBecomePiwikSupporter'|translate }}"/> <a class="donate-spacer">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a> <a href="index.php?module=CoreHome&action=redirectToPaypal&idSite=1&cmd=_s-xclick&hosted_button_id=RPL23NJURMTFA&bb2_screener_=1357583494+83.233.186.82" @@ -41,11 +41,11 @@ </div> <!-- to cache images --> - <img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_0.png"/> - <img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_1.png"/> - <img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_2.png"/> - <img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_3.png"/> - <img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_4.png"/> + <img style="display:none;" src="plugins/Morpheus/images/smileyprog_0.png"/> + <img style="display:none;" src="plugins/Morpheus/images/smileyprog_1.png"/> + <img style="display:none;" src="plugins/Morpheus/images/smileyprog_2.png"/> + <img style="display:none;" src="plugins/Morpheus/images/smileyprog_3.png"/> + <img style="display:none;" src="plugins/Morpheus/images/smileyprog_4.png"/> </form> {% if footerMessage is defined %} <div class="form-description"> diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index 2ca3785705..d25fc17bdc 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -5,8 +5,8 @@ {% set updateCheck %} <div id="updateCheckLinkContainer"> - <span class='loadingPiwik' style="display:none;"><img src='plugins/Zeitgeist/images/loading-blue.gif'/></span> - <img class="icon" src="plugins/Zeitgeist/images/reload.png"/> + <span class='loadingPiwik' style="display:none;"><img src='plugins/Morpheus/images/loading-blue.gif'/></span> + <img class="icon" src="plugins/Morpheus/images/reload.png"/> <a href="#" id="checkForUpdates"><em>{{ 'CoreHome_CheckForUpdates'|translate }}</em></a> </div> {% endset %} diff --git a/plugins/CoreHome/templates/_warningInvalidHost.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig index 3a5c603d05..d3a2661a86 100644 --- a/plugins/CoreHome/templates/_warningInvalidHost.twig +++ b/plugins/CoreHome/templates/_warningInvalidHost.twig @@ -1,7 +1,7 @@ {# 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" target="_blank"><img src="plugins/Zeitgeist/images/help.png"/></a> + <a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Morpheus/images/help.png"/></a> <strong>{{ 'General_Warning'|translate }}: </strong>{{ invalidHostMessage|raw }} <br> @@ -9,7 +9,7 @@ <small>{{ invalidHostMessageHowToFix|raw }} <br/><br/><a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank">{{ 'General_Help'|translate }} - <img style="vertical-align: bottom;" src="plugins/Zeitgeist/images/help.png"/></a><br/> + <img style="vertical-align: bottom;" src="plugins/Morpheus/images/help.png"/></a><br/> </small> {% endset %} diff --git a/plugins/CoreHome/templates/getPromoVideo.twig b/plugins/CoreHome/templates/getPromoVideo.twig index ea70ffaa00..2f61742e00 100755 --- a/plugins/CoreHome/templates/getPromoVideo.twig +++ b/plugins/CoreHome/templates/getPromoVideo.twig @@ -1,7 +1,7 @@ <div id="piwik-promo"> <div id="piwik-promo-video"> <div id="piwik-promo-thumbnail"> - <img src="plugins/Zeitgeist/images/video_play.png"/> + <img src="plugins/Morpheus/images/video_play.png"/> </div> <div id="piwik-promo-embed" style="display:none;"> @@ -27,7 +27,7 @@ {# email #} <a href="mailto:?body={{ shareTextLong|url_encode(true) }}&subject={{ shareText|url_encode(true) }}" target="_blank"> - <img src="plugins/Zeitgeist/images/email.png" /> + <img src="plugins/Morpheus/images/email.png" /> </a> </div> diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index df42eba84a..5376559f13 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -53,7 +53,7 @@ {% endmacro %} {% macro pluginDeveloper(owner) %} - {% if 'piwik' == owner %}<img title="Piwik" alt="Piwik" style="padding-bottom:2px;height:11px;" src="plugins/Zeitgeist/images/logo-marketplace.png"/>{% else %}{{ owner }}{% endif %} + {% if 'piwik' == owner %}<img title="Piwik" alt="Piwik" style="padding-bottom:2px;height:11px;" src="plugins/Morpheus/images/logo-marketplace.png"/>{% else %}{{ owner }}{% endif %} {% endmacro %} {% macro featuredIcon(align='') %} diff --git a/plugins/CoreUpdater/templates/oneClickResults.twig b/plugins/CoreUpdater/templates/oneClickResults.twig index 3ec19a7ce5..555e1ef568 100644 --- a/plugins/CoreUpdater/templates/oneClickResults.twig +++ b/plugins/CoreUpdater/templates/oneClickResults.twig @@ -9,11 +9,11 @@ {% if coreError %} <br/> <br/> - <div class="error"><img src="plugins/Zeitgeist/images/error_medium.png"/> {{ coreError }}</div> + <div class="error"><img src="plugins/Morpheus/images/error_medium.png"/> {{ coreError }}</div> <br/> <br/> <div class="warning"> - <img src="plugins/Zeitgeist/images/warning_medium.png"/> + <img src="plugins/Morpheus/images/warning_medium.png"/> {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/update/'>","</a>")|raw }} </div> <br/> diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig index fb6b9bad57..0a2eaa5efe 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig @@ -8,7 +8,7 @@ <br/> <br/> <div class="error"> - <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} + <img src="plugins/Morpheus/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} {% for message in errorMessages %} <pre>{{ message }}</pre> <br/> @@ -32,7 +32,7 @@ {% else %} {% if warningMessages|length > 0 %} <div class="warning"> - <p><img src="plugins/Zeitgeist/images/warning_medium.png"/> {{ 'CoreUpdater_WarningMessages'|translate }}</p> + <p><img src="plugins/Morpheus/images/warning_medium.png"/> {{ 'CoreUpdater_WarningMessages'|translate }}</p> {% for message in warningMessages %} <pre>{{ message }}</pre> <br/> @@ -42,7 +42,7 @@ {% if errorMessages|length > 0 %} <div class="warning"> - <p><img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}</p> + <p><img src="plugins/Morpheus/images/error_medium.png"/> {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}</p> {% for message in errorMessages %} <pre>{{ message }}</pre> <br/> @@ -51,7 +51,7 @@ {% if deactivatedPlugins is defined and deactivatedPlugins|length > 0 %} {% set listOfDeactivatedPlugins=deactivatedPlugins|join(', ') %} <p style="color:red;"> - <img src="plugins/Zeitgeist/images/error_medium.png"/> + <img src="plugins/Morpheus/images/error_medium.png"/> {{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }} </p> {% endif %} diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig index 212a82472a..098ffa387c 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig @@ -11,7 +11,7 @@ <br/> <br/> <div class="error"> - <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} + <img src="plugins/Morpheus/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} {% for message in errorMessages %} <pre>{{ message|raw }}</pre> {% endfor %} diff --git a/plugins/CoreVisualizations/Visualizations/Cloud.php b/plugins/CoreVisualizations/Visualizations/Cloud.php index 19f79c3819..86c95521eb 100644 --- a/plugins/CoreVisualizations/Visualizations/Cloud.php +++ b/plugins/CoreVisualizations/Visualizations/Cloud.php @@ -26,7 +26,7 @@ class Cloud extends Visualization { const ID = 'cloud'; const TEMPLATE_FILE = "@CoreVisualizations/_dataTableViz_tagCloud.twig"; - const FOOTER_ICON = 'plugins/Zeitgeist/images/tagcloud.png'; + const FOOTER_ICON = 'plugins/Morpheus/images/tagcloud.png'; const FOOTER_ICON_TITLE = 'General_TagCloud'; /** Used by integration tests to make sure output is consistent. */ diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/plugins/CoreVisualizations/Visualizations/HtmlTable.php index 5c8ac4d01f..e61c34e944 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable.php @@ -23,7 +23,7 @@ class HtmlTable extends Visualization { const ID = 'table'; const TEMPLATE_FILE = "@CoreVisualizations/_dataTableViz_htmlTable.twig"; - const FOOTER_ICON = 'plugins/Zeitgeist/images/table.png'; + const FOOTER_ICON = 'plugins/Morpheus/images/table.png'; const FOOTER_ICON_TITLE = 'General_DisplaySimpleTable'; public static function getDefaultConfig() diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php index b203f9912d..20db5fbf10 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php @@ -18,7 +18,7 @@ use Piwik\View; class AllColumns extends HtmlTable { const ID = 'tableAllColumns'; - const FOOTER_ICON = 'plugins/Zeitgeist/images/table_more.png'; + const FOOTER_ICON = 'plugins/Morpheus/images/table_more.png'; const FOOTER_ICON_TITLE = 'General_DisplayTableWithMoreMetrics'; public function beforeRender() diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php index 34a2c306ae..d8e9716a1c 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php @@ -18,7 +18,7 @@ use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph; class Bar extends JqplotGraph { const ID = 'graphVerticalBar'; - const FOOTER_ICON = 'plugins/Zeitgeist/images/chart_bar.png'; + const FOOTER_ICON = 'plugins/Morpheus/images/chart_bar.png'; const FOOTER_ICON_TITLE = 'General_VBarGraph'; public function beforeRender() diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php index d110336ce8..2e694e9228 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Pie.php @@ -18,7 +18,7 @@ use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph; class Pie extends JqplotGraph { const ID = 'graphPie'; - const FOOTER_ICON = 'plugins/Zeitgeist/images/chart_pie.png'; + const FOOTER_ICON = 'plugins/Morpheus/images/chart_pie.png'; const FOOTER_ICON_TITLE = 'General_Piechart'; public static function getDefaultConfig() diff --git a/plugins/CoreVisualizations/stylesheets/jqplot.css b/plugins/CoreVisualizations/stylesheets/jqplot.css index 1db464c4a0..63c231a967 100644 --- a/plugins/CoreVisualizations/stylesheets/jqplot.css +++ b/plugins/CoreVisualizations/stylesheets/jqplot.css @@ -1,5 +1,5 @@ .jqplot-loading { - background: url(../../Zeitgeist/images/loading-blue.gif) no-repeat center center white; + background: url(../../Morpheus/images/loading-blue.gif) no-repeat center center white; position: absolute; z-index: 10; } @@ -169,7 +169,7 @@ margin: 2px 0 5px 0; padding: 5px 0 5px 23px; color: #888; - background: url(../../Zeitgeist/images/help.png) no-repeat left center; + background: url(../../Morpheus/images/help.png) no-repeat left center; } .rowevolution .metric-selectbox, @@ -206,7 +206,7 @@ a.rowevolution-startmulti:hover { width: 24px; height: 16px; margin-top: 3px; - background: url(../../Zeitgeist/images/chart_line_edit.png) no-repeat center center; + background: url(../../Morpheus/images/chart_line_edit.png) no-repeat center center; overflow: hidden; text-indent: -999px; } @@ -216,7 +216,7 @@ a.rowevolution-startmulti:hover { position: absolute; z-index: 1010; /* must be above ui dialog */ margin-top: -2px; - background: url(../../Zeitgeist/images/chart_line_edit.png) no-repeat 7px 4px #f7f7f7; + background: url(../../Morpheus/images/chart_line_edit.png) no-repeat 7px 4px #f7f7f7; font-size: 11px; font-weight: normal; border: 1px solid #e4e5e4; diff --git a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml index 0c88a7b4f8..7bcb79355e 100644 --- a/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/expected/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml @@ -8,7 +8,7 @@ <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -23,7 +23,7 @@ <goalPageId /> <url>http://localhost</url> - <icon>plugins/Zeitgeist/images/goal.png</icon> + <icon>plugins/Morpheus/images/goal.png</icon> </row> <row> <type>action</type> diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml index baefedde11..b6d9fe00f8 100644 --- a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml @@ -8,7 +8,7 @@ <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -23,7 +23,7 @@ <goalPageId /> <url>http://localhost</url> - <icon>plugins/Zeitgeist/images/goal.png</icon> + <icon>plugins/Morpheus/images/goal.png</icon> </row> <row> <type>action</type> diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig index ec425ee5dd..32a8e78d08 100755 --- a/plugins/DBStats/templates/index.twig +++ b/plugins/DBStats/templates/index.twig @@ -61,7 +61,7 @@ <h2>{{ 'General_Reports'|translate }}</h2> <div class="ajaxLoad" action="getIndividualReportsSummary"> - <span class="loadingPiwik"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span> + <span class="loadingPiwik"><img src="plugins/Morpheus/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span> </div> </td> </tr> @@ -79,7 +79,7 @@ <h2>{{ 'General_Metrics'|translate }}</h2> <div class="ajaxLoad" action="getIndividualMetricsSummary"> - <span class="loadingPiwik"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span> + <span class="loadingPiwik"><img src="plugins/Morpheus/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span> </div> </td> </tr> diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less index 704780fac7..cac2514dc6 100644 --- a/plugins/Dashboard/stylesheets/dashboard.less +++ b/plugins/Dashboard/stylesheets/dashboard.less @@ -100,7 +100,7 @@ .widgetContent.loading { opacity: 0.5; - background: url(plugins/Zeitgeist/images/loading-blue.gif) no-repeat top right; + background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat top right; } .widget h2 { @@ -114,7 +114,7 @@ } .widgetTop { - background: #b5b0a7 url(plugins/Zeitgeist/images/dashboard_h_bg.png) repeat-x 0 0; + background: #b5b0a7 url(plugins/Morpheus/images/dashboard_h_bg.png) repeat-x 0 0; cursor: move; font-size: 10pt; font-weight: bold; @@ -122,7 +122,7 @@ } .widgetTopHover { - background: #C4BBAD url(plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0; + background: #C4BBAD url(plugins/Morpheus/images/dashboard_h_bg_hover.png) repeat-x 0 0; } .widgetName { @@ -177,7 +177,7 @@ } .ui-dialog-buttonset input[type=button], .ui-dialog-buttonset button { - background: #B5B0A7 url(plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0 !important; + background: #B5B0A7 url(plugins/Morpheus/images/dashboard_h_bg_hover.png) repeat-x 0 0 !important; color: #fff !important; border: 0 !important; font-size: 12px !important; @@ -249,7 +249,7 @@ } .dashboardSettings > span { - background: url(plugins/Zeitgeist/images/sort_subtable_desc.png) right center no-repeat; + background: url(plugins/Morpheus/images/sort_subtable_desc.png) right center no-repeat; padding-right: 20px; display: block; } @@ -384,7 +384,7 @@ ul.widgetpreview-widgetlist li { } .widgetpreview-base li.widgetpreview-choosen { - background: #e4e2d7 url(plugins/Zeitgeist/images/arr_r.png) no-repeat right 6px; + background: #e4e2d7 url(plugins/Morpheus/images/arr_r.png) no-repeat right 6px; color: #255792; font-weight: bold; } diff --git a/plugins/Dashboard/templates/_widgetFactoryTemplate.twig b/plugins/Dashboard/templates/_widgetFactoryTemplate.twig index 511fb18ce8..bbbad28274 100644 --- a/plugins/Dashboard/templates/_widgetFactoryTemplate.twig +++ b/plugins/Dashboard/templates/_widgetFactoryTemplate.twig @@ -2,16 +2,16 @@ <div class="widget"> <div class="widgetTop"> <div class="button" id="close"> - <img src="plugins/Zeitgeist/images/close.png" title="{{ 'General_Close'|translate }}" /> + <img src="plugins/Morpheus/images/close.png" title="{{ 'General_Close'|translate }}" /> </div> <div class="button" id="maximise"> - <img src="plugins/Zeitgeist/images/maximise.png" title="{{ 'Dashboard_Maximise'|translate }}" /> + <img src="plugins/Morpheus/images/maximise.png" title="{{ 'Dashboard_Maximise'|translate }}" /> </div> <div class="button" id="minimise"> - <img src="plugins/Zeitgeist/images/minimise.png" title="{{ 'Dashboard_Minimise'|translate }}" /> + <img src="plugins/Morpheus/images/minimise.png" title="{{ 'Dashboard_Minimise'|translate }}" /> </div> <div class="button" id="refresh"> - <img src="plugins/Zeitgeist/images/refresh.png" title="{{ 'General_Refresh'|translate }}" /> + <img src="plugins/Morpheus/images/refresh.png" title="{{ 'General_Refresh'|translate }}" /> </div> <div class="widgetName">{% if widgetName is defined %}{{ widgetName }}{% endif %}</div> </div> diff --git a/plugins/ExampleTheme/stylesheets/theme.less b/plugins/ExampleTheme/stylesheets/theme.less index 21d79a1bff..e55b60d4c5 100644 --- a/plugins/ExampleTheme/stylesheets/theme.less +++ b/plugins/ExampleTheme/stylesheets/theme.less @@ -1,4 +1,3 @@ -@import "plugins/Morpheus/stylesheets/theme.less"; @import "_colors.less"; @theme-fontFamily-base: Verdana, sans-serif; diff --git a/plugins/Goals/Visualizations/Goals.php b/plugins/Goals/Visualizations/Goals.php index bee7c892ab..8bb5f6d996 100644 --- a/plugins/Goals/Visualizations/Goals.php +++ b/plugins/Goals/Visualizations/Goals.php @@ -24,7 +24,7 @@ use Piwik\View; class Goals extends HtmlTable { const ID = 'tableGoals'; - const FOOTER_ICON = 'plugins/Zeitgeist/images/goal.png'; + const FOOTER_ICON = 'plugins/Morpheus/images/goal.png'; const FOOTER_ICON_TITLE = 'General_DisplayTableWithMoreMetrics'; public function beforeLoadDataTable() diff --git a/plugins/Goals/templates/_listGoalEdit.twig b/plugins/Goals/templates/_listGoalEdit.twig index 0d9444dcff..11c1172f90 100644 --- a/plugins/Goals/templates/_listGoalEdit.twig +++ b/plugins/Goals/templates/_listGoalEdit.twig @@ -23,13 +23,13 @@ <td>{% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite)|raw }}{% endif %}</td> <td> <a href='#' name="linkEditGoal" id="{{ goal.idgoal }}" class="link_but"> - <img src='plugins/Zeitgeist/images/ico_edit.png' border="0"/> + <img src='plugins/Morpheus/images/ico_edit.png' border="0"/> {{ 'General_Edit'|translate }} </a> </td> <td> <a href='#' name="linkDeleteGoal" id="{{ goal.idgoal }}" class="link_but"> - <img src='plugins/Zeitgeist/images/ico_delete.png' border="0"/> + <img src='plugins/Morpheus/images/ico_delete.png' border="0"/> {{ 'General_Delete'|translate }} </a> </td> diff --git a/plugins/Goals/templates/_titleAndEvolutionGraph.twig b/plugins/Goals/templates/_titleAndEvolutionGraph.twig index 698ca47106..4fe5c66dcc 100644 --- a/plugins/Goals/templates/_titleAndEvolutionGraph.twig +++ b/plugins/Goals/templates/_titleAndEvolutionGraph.twig @@ -10,7 +10,7 @@ {% if ecommerce is defined %} <strong>{{ nb_conversions }}</strong> {{ 'General_EcommerceOrders'|translate }} - <img src='plugins/Zeitgeist/images/ecommerceOrder.gif'> + <img src='plugins/Morpheus/images/ecommerceOrder.gif'> {% else %} {{ 'Goals_Conversions'|translate("<strong>"~nb_conversions~"</strong>")|raw }} {% endif %} @@ -54,7 +54,7 @@ {% if ecommerce is defined %} <div id='rightcolumn' {% if not isWidget %}style='width:30%;'{% endif %}> <div> - <img src='plugins/Zeitgeist/images/ecommerceAbandonedCart.gif'> <em>{{ 'General_AbandonedCarts'|translate }}</em> + <img src='plugins/Morpheus/images/ecommerceAbandonedCart.gif'> <em>{{ 'General_AbandonedCarts'|translate }}</em> </div> <div class="sparkline"> diff --git a/plugins/Installation/stylesheets/installation.css b/plugins/Installation/stylesheets/installation.css index ece6783471..68ec544bb4 100644 --- a/plugins/Installation/stylesheets/installation.css +++ b/plugins/Installation/stylesheets/installation.css @@ -184,7 +184,7 @@ td { .submit input { margin-top: 15px; - background: transparent url(../../../plugins/Zeitgeist/images/background-submit.png) repeat scroll 0; + background: transparent url(../../../plugins/Morpheus/images/background-submit.png) repeat scroll 0; font-size: 1.4em; border-color: #CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204); border-style: double; diff --git a/plugins/Installation/templates/_systemCheckLegend.twig b/plugins/Installation/templates/_systemCheckLegend.twig index 66e1d1b4bd..e0b54d17ac 100644 --- a/plugins/Installation/templates/_systemCheckLegend.twig +++ b/plugins/Installation/templates/_systemCheckLegend.twig @@ -2,11 +2,11 @@ <span style="font-size: small;"> <h2>{{ 'Installation_Legend'|translate }}</h2> <br/> - <img src='plugins/Zeitgeist/images/warning.png'/> <span class="warn">{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}</span> + <img src='plugins/Morpheus/images/warning.png'/> <span class="warn">{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}</span> <br/> - <img src='plugins/Zeitgeist/images/error.png'/> <span style="color:red;font-weight:bold;">{{ 'General_Error'|translate }} + <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/Zeitgeist/images/ok.png'/> <span style="color:#26981C;font-weight:bold;">{{ 'General_Ok'|translate }}</span><br/> + <img src='plugins/Morpheus/images/ok.png'/> <span style="color:#26981C;font-weight:bold;">{{ 'General_Ok'|translate }}</span><br/> </span> </div> diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig index 5f0ec0e6a5..b8a3248a97 100755 --- a/plugins/Installation/templates/_systemCheckSection.twig +++ b/plugins/Installation/templates/_systemCheckSection.twig @@ -1,7 +1,7 @@ -{% set ok %}<img src='plugins/Zeitgeist/images/ok.png' />{% endset %} -{% set error %}<img src='plugins/Zeitgeist/images/error.png' />{% endset %} -{% set warning %}<img src='plugins/Zeitgeist/images/warning.png' />{% endset %} -{% set link %}<img src='plugins/Zeitgeist/images/link.gif' />{% endset %} +{% set ok %}<img src='plugins/Morpheus/images/ok.png' />{% endset %} +{% set error %}<img src='plugins/Morpheus/images/error.png' />{% endset %} +{% set warning %}<img src='plugins/Morpheus/images/warning.png' />{% endset %} +{% set link %}<img src='plugins/Morpheus/images/link.gif' />{% endset %} <table class="infosServer" id="systemCheckRequired"> <tr> diff --git a/plugins/Installation/templates/databaseSetup.twig b/plugins/Installation/templates/databaseSetup.twig index a6e97db574..7fb639537b 100644 --- a/plugins/Installation/templates/databaseSetup.twig +++ b/plugins/Installation/templates/databaseSetup.twig @@ -5,7 +5,7 @@ {% if errorMessage is defined %} <div class="error"> - <img src="plugins/Zeitgeist/images/error_medium.png"/> + <img src="plugins/Morpheus/images/error_medium.png"/> {{ 'Installation_DatabaseErrorConnect'|translate }}: <br/>{{ errorMessage|raw }} diff --git a/plugins/Installation/templates/firstWebsiteSetup.twig b/plugins/Installation/templates/firstWebsiteSetup.twig index 4c2ad9b078..0095fe9b8f 100644 --- a/plugins/Installation/templates/firstWebsiteSetup.twig +++ b/plugins/Installation/templates/firstWebsiteSetup.twig @@ -4,7 +4,7 @@ {% if displayGeneralSetupSuccess is defined %} <span id="toFade" class="success"> {{ 'Installation_SuperUserSetupSuccess'|translate }} - <img src="plugins/Zeitgeist/images/success_medium.png"/> + <img src="plugins/Morpheus/images/success_medium.png"/> </span> {% endif %} @@ -12,7 +12,7 @@ <p>{{ 'Installation_SiteSetup'|translate }}</p> {% if errorMessage is defined %} <div class="error"> - <img src="plugins/Zeitgeist/images/error_medium.png"/> + <img src="plugins/Morpheus/images/error_medium.png"/> {{ 'Installation_SetupWebsiteError'|translate }}: <br/>- {{ errorMessage|raw }} diff --git a/plugins/Installation/templates/reuseTables.twig b/plugins/Installation/templates/reuseTables.twig index e963f0c280..909c6d5c95 100644 --- a/plugins/Installation/templates/reuseTables.twig +++ b/plugins/Installation/templates/reuseTables.twig @@ -10,7 +10,7 @@ {% if coreError %} <div class="error"> - <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} + <img src="plugins/Morpheus/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} <ul> {% for message in errorMessages %} <li>{{ message }}</li> @@ -34,7 +34,7 @@ {% else %} {% if warningMessages|length > 0 %} <div class="warning"> - <img src="plugins/Zeitgeist/images/warning_medium.png"/> {{ 'CoreUpdater_WarningMessages'|translate }} + <img src="plugins/Morpheus/images/warning_medium.png"/> {{ 'CoreUpdater_WarningMessages'|translate }} <ul> {% for message in warningMessages %} <li>{{ message }}</li> @@ -45,7 +45,7 @@ {% if errorMessages|length > 0 %} <div class="error"> - <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }} + <img src="plugins/Morpheus/images/error_medium.png"/> {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }} <ul> {% for message in errorMessages %} <li>{{ message }}</li> @@ -55,7 +55,7 @@ {% if deactivatedPlugins is defined and deactivatedPlugins|length > 0 %} {% set listOfDeactivatedPlugins=deactivatedPlugins|join(', ') %} <p style="color:red;"> - <img src="plugins/Zeitgeist/images/error_medium.png"/> + <img src="plugins/Morpheus/images/error_medium.png"/> {{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }} </p> {% endif %} @@ -70,7 +70,7 @@ </p> {% else %} <div class="success"> {{ 'Installation_TablesUpdatedSuccess'|translate(oldVersion, currentVersion) }} - <img src="plugins/Zeitgeist/images/success_medium.png"/></div> + <img src="plugins/Morpheus/images/success_medium.png"/></div> <br /> {% endif %} diff --git a/plugins/Installation/templates/setupSuperUser.twig b/plugins/Installation/templates/setupSuperUser.twig index e031d67acd..5a7230ae46 100644 --- a/plugins/Installation/templates/setupSuperUser.twig +++ b/plugins/Installation/templates/setupSuperUser.twig @@ -5,7 +5,7 @@ {% if errorMessage is defined %} <div class="error"> - <img src="plugins/Zeitgeist/images/error_medium.png"/> + <img src="plugins/Morpheus/images/error_medium.png"/> {{ 'Installation_SuperUserSetupError'|translate }}: <br/>- {{ errorMessage|raw }} diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig index d0b6514029..f142e4edef 100644 --- a/plugins/Installation/templates/systemCheck.twig +++ b/plugins/Installation/templates/systemCheck.twig @@ -23,7 +23,7 @@ {% if not showNextStep %} <br/> <p> - <img src='plugins/Zeitgeist/images/link.gif'/> + <img src='plugins/Morpheus/images/link.gif'/> <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 f6533496d0..1d214ba395 100755 --- a/plugins/Installation/templates/systemCheckPage.twig +++ b/plugins/Installation/templates/systemCheckPage.twig @@ -5,13 +5,13 @@ <h2 piwik-enriched-headline>{{ 'Installation_SystemCheck'|translate }}</h2> <p style="margin-left:1em;"> {% if infos.has_errors %} - <img src="plugins/Zeitgeist/images/error.png"/> + <img src="plugins/Morpheus/images/error.png"/> {{ 'Installation_SystemCheckSummaryThereWereErrors'|translate('<strong>','</strong>','<strong><em>','</em></strong>')|raw }} {{ 'Installation_SeeBelowForMoreInfo'|translate }} {% elseif infos.has_warnings %} - <img src="plugins/Zeitgeist/images/warning.png"/> + <img src="plugins/Morpheus/images/warning.png"/> {{ 'Installation_SystemCheckSummaryThereWereWarnings'|translate }} {{ 'Installation_SeeBelowForMoreInfo'|translate }} {% else %} - <img src="plugins/Zeitgeist/images/ok.png"/> + <img src="plugins/Morpheus/images/ok.png"/> {{ 'Installation_SystemCheckSummaryNoProblems'|translate }} {% endif %} </p> diff --git a/plugins/Installation/templates/tablesCreation.twig b/plugins/Installation/templates/tablesCreation.twig index 9d2a30273b..5ff440e29a 100644 --- a/plugins/Installation/templates/tablesCreation.twig +++ b/plugins/Installation/templates/tablesCreation.twig @@ -6,7 +6,7 @@ {% if someTablesInstalled is defined %} <div class="warning">{{ 'Installation_TablesWithSameNamesFound'|translate("<span id='linkToggle'>","</span>")|raw }} - <img src="plugins/Zeitgeist/images/warning_medium.png"/> + <img src="plugins/Morpheus/images/warning_medium.png"/> </div> <div id="toggle" style="display:none;color:#4F2410;font-size: small;"> <em>{{ 'Installation_TablesFound'|translate }}: <br/> @@ -23,12 +23,12 @@ {% if existingTablesDeleted is defined %} <div class="success"> {{ 'Installation_TablesDeletedSuccess'|translate }} - <img src="plugins/Zeitgeist/images/success_medium.png"/></div> + <img src="plugins/Morpheus/images/success_medium.png"/></div> {% endif %} {% if tablesCreated is defined %} <div class="success"> {{ 'Installation_TablesCreatedSuccess'|translate }} - <img src="plugins/Zeitgeist/images/success_medium.png"/></div> + <img src="plugins/Morpheus/images/success_medium.png"/></div> {% endif %} <script> diff --git a/plugins/Installation/templates/trackingCode.twig b/plugins/Installation/templates/trackingCode.twig index 0a72269753..3ca7992cfa 100644 --- a/plugins/Installation/templates/trackingCode.twig +++ b/plugins/Installation/templates/trackingCode.twig @@ -4,7 +4,7 @@ {% if displayfirstWebsiteSetupSuccess is defined %} <span id="toFade" class="success"> {{ 'Installation_SetupWebsiteSetupSuccess'|translate(displaySiteName) }} - <img src="plugins/Zeitgeist/images/success_medium.png"/> + <img src="plugins/Morpheus/images/success_medium.png"/> </span> {% endif %} diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 0eca7043c3..c52f8dc0f3 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -580,9 +580,9 @@ class Visitor $status = $this->getVisitEcommerceStatus(); if (in_array($status, array('ordered', 'orderedThenAbandonedCart'))) { - return "plugins/Zeitgeist/images/ecommerceOrder.gif"; + return "plugins/Morpheus/images/ecommerceOrder.gif"; } elseif ($status == 'abandonedCart') { - return "plugins/Zeitgeist/images/ecommerceAbandonedCart.gif"; + return "plugins/Morpheus/images/ecommerceAbandonedCart.gif"; } return null; } @@ -595,7 +595,7 @@ class Visitor function getVisitorGoalConvertedIcon() { return $this->isVisitorGoalConverted() - ? "plugins/Zeitgeist/images/goal.png" + ? "plugins/Morpheus/images/goal.png" : null; } @@ -932,27 +932,27 @@ class Visitor foreach ($visitorDetailsArray['actionDetails'] as &$details) { switch ($details['type']) { case 'goal': - $details['icon'] = 'plugins/Zeitgeist/images/goal.png'; + $details['icon'] = 'plugins/Morpheus/images/goal.png'; break; case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER: case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART: - $details['icon'] = 'plugins/Zeitgeist/images/' . $details['type'] . '.gif'; + $details['icon'] = 'plugins/Morpheus/images/' . $details['type'] . '.gif'; break; case Action::TYPE_DOWNLOAD: $details['type'] = 'download'; - $details['icon'] = 'plugins/Zeitgeist/images/download.png'; + $details['icon'] = 'plugins/Morpheus/images/download.png'; break; case Action::TYPE_OUTLINK: $details['type'] = 'outlink'; - $details['icon'] = 'plugins/Zeitgeist/images/link.gif'; + $details['icon'] = 'plugins/Morpheus/images/link.gif'; break; case Action::TYPE_SITE_SEARCH: $details['type'] = 'search'; - $details['icon'] = 'plugins/Zeitgeist/images/search_ico.png'; + $details['icon'] = 'plugins/Morpheus/images/search_ico.png'; break; case Action::TYPE_EVENT_CATEGORY: $details['type'] = 'event'; - $details['icon'] = 'plugins/Zeitgeist/images/event.png'; + $details['icon'] = 'plugins/Morpheus/images/event.png'; break; default: $details['type'] = 'action'; diff --git a/plugins/Live/VisitorLog.php b/plugins/Live/VisitorLog.php index f130a3d132..95b86f3eb4 100644 --- a/plugins/Live/VisitorLog.php +++ b/plugins/Live/VisitorLog.php @@ -86,7 +86,7 @@ class VisitorLog extends Visualization array( 'id' => static::ID, 'title' => Piwik::translate('Live_LinkVisitorLog'), - 'icon' => 'plugins/Zeitgeist/images/table.png' + 'icon' => 'plugins/Morpheus/images/table.png' ) ) ) diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig index 292902db5b..20b493c691 100644 --- a/plugins/Live/templates/getSingleVisitSummary.twig +++ b/plugins/Live/templates/getSingleVisitSummary.twig @@ -20,7 +20,7 @@ <strong>{{ visitData.visitorId }}</strong> {% if widgetizedLink is defined %}</a>{% endif %} <a class="visitor-profile-export" href="{{ exportLink }}" target="_blank" title="{{ 'General_ExportThisReport'|translate }}" style="visibility:hidden"> - <img src="plugins/Zeitgeist/images/export.png"/> + <img src="plugins/Morpheus/images/export.png"/> </a> </li> <li> diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index b3159a3761..a96b60ecea 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -18,7 +18,7 @@ <div> <div class="visitor-profile-header"> {% if visitorData.previousVisitorId is not empty %}<a class="visitor-profile-prev-visitor" href="#" title="{{ 'Live_PreviousVisitor'|translate }}">←</a>{% endif %} - <h1>{{ 'Live_VisitorProfile'|translate }} <img class="loadingPiwik" style="display:none;" src="plugins/Zeitgeist/images/loading-blue.gif"/></h1> + <h1>{{ 'Live_VisitorProfile'|translate }} <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/></h1> <a href="http://piwik.org/docs/user-profile/" class="reportDocumentationIcon" target="_blank" title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}"></a> {% if visitorData.nextVisitorId is not empty %}<a class="visitor-profile-next-visitor" href="#" title="{{ 'Live_NextVisitor'|translate }}">→</a>{% endif %} </div> @@ -117,7 +117,7 @@ {{- 'General_XFromY'|translate(entryVisits, entryCountry)|raw -}}{% if not loop.last %}, {% endif %} {%- endfor %} - <a class="visitor-profile-show-map" href="#" {% if userCountryMapUrl|default('') is empty %}style="display:none"{% endif %}>({{ 'Live_ShowMap'|translate|replace({' ': ' '})|raw }})</a> <img class="loadingPiwik" style="display:none;" src="plugins/Zeitgeist/images/loading-blue.gif"/> + <a class="visitor-profile-show-map" href="#" {% if userCountryMapUrl|default('') is empty %}style="display:none"{% endif %}>({{ 'Live_ShowMap'|translate|replace({' ': ' '})|raw }})</a> <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/> </p> <div class="visitor-profile-map" style="display:none" data-href="{{ userCountryMapUrl|default('') }}"> </div> @@ -135,7 +135,7 @@ </div> <div class="visitor-profile-more-info"> {% if visitorData.lastVisits.getRowsCount() >= constant("Piwik\\Plugins\\Live\\API::VISITOR_PROFILE_MAX_VISITS_TO_SHOW") %} - <a href="#">{{ 'Live_LoadMoreVisits'|translate }}</a> <img class="loadingPiwik" style="display:none;" src="plugins/Zeitgeist/images/loading-blue.gif"/> + <a href="#">{{ 'Live_LoadMoreVisits'|translate }}</a> <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/images/loading-blue.gif"/> {% else %} <span class="visitor-profile-no-visits">{{ 'Live_NoMoreVisits'|translate }}</span> {% endif %} diff --git a/plugins/Login/stylesheets/login.css b/plugins/Login/stylesheets/login.css index ab472c11a1..fd473bb18a 100644 --- a/plugins/Login/stylesheets/login.css +++ b/plugins/Login/stylesheets/login.css @@ -25,7 +25,7 @@ } #logo .description .arrow { - background: url(../../Zeitgeist/images/affix-arrow.png); + background: url(../../Morpheus/images/affix-arrow.png); width: 50px; height: 68px; position: absolute; @@ -132,7 +132,7 @@ #reset_form_password_bis, #login_form_login, #reset_form_login { - background: #fff url(../../Zeitgeist/images/login-sprite.png) no-repeat; + background: #fff url(../../Morpheus/images/login-sprite.png) no-repeat; } #login_form_password, diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index 9e08d7d39d..22096f8fc2 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -129,7 +129,7 @@ <fieldset class="actions"> <span class="loadingPiwik" style="display:none;"> - <img alt="Loading" src="plugins/Zeitgeist/images/loading-blue.gif"/> + <img alt="Loading" src="plugins/Morpheus/images/loading-blue.gif"/> </span> <input class="submit" id='reset_form_submit' type="submit" value="{{ 'General_ChangePassword'|translate }}" tabindex="100"/> diff --git a/plugins/Morpheus/images/affix-arrow.png b/plugins/Morpheus/images/affix-arrow.png Binary files differnew file mode 100644 index 0000000000..bc45f553a4 --- /dev/null +++ b/plugins/Morpheus/images/affix-arrow.png diff --git a/plugins/Morpheus/images/arr_r.png b/plugins/Morpheus/images/arr_r.png Binary files differnew file mode 100644 index 0000000000..4a244a89e9 --- /dev/null +++ b/plugins/Morpheus/images/arr_r.png diff --git a/plugins/Morpheus/images/dashboard_h_bg.png b/plugins/Morpheus/images/dashboard_h_bg.png Binary files differnew file mode 100644 index 0000000000..279a94949d --- /dev/null +++ b/plugins/Morpheus/images/dashboard_h_bg.png diff --git a/plugins/Morpheus/images/data_table_footer_active_item.png b/plugins/Morpheus/images/data_table_footer_active_item.png Binary files differnew file mode 100644 index 0000000000..343591f6bf --- /dev/null +++ b/plugins/Morpheus/images/data_table_footer_active_item.png diff --git a/plugins/Morpheus/images/delete.png b/plugins/Morpheus/images/delete.png Binary files differnew file mode 100644 index 0000000000..f2a3c2a20d --- /dev/null +++ b/plugins/Morpheus/images/delete.png diff --git a/plugins/Morpheus/images/download.png b/plugins/Morpheus/images/download.png Binary files differnew file mode 100644 index 0000000000..1920b1bb22 --- /dev/null +++ b/plugins/Morpheus/images/download.png diff --git a/plugins/Morpheus/images/ecommerceAbandonedCart.gif b/plugins/Morpheus/images/ecommerceAbandonedCart.gif Binary files differnew file mode 100644 index 0000000000..b4ec1d75f7 --- /dev/null +++ b/plugins/Morpheus/images/ecommerceAbandonedCart.gif diff --git a/plugins/Morpheus/images/ecommerceOrder.gif b/plugins/Morpheus/images/ecommerceOrder.gif Binary files differnew file mode 100644 index 0000000000..664e035509 --- /dev/null +++ b/plugins/Morpheus/images/ecommerceOrder.gif diff --git a/plugins/Morpheus/images/email.png b/plugins/Morpheus/images/email.png Binary files differnew file mode 100644 index 0000000000..4a6c5d396a --- /dev/null +++ b/plugins/Morpheus/images/email.png diff --git a/plugins/Morpheus/images/error.png b/plugins/Morpheus/images/error.png Binary files differnew file mode 100644 index 0000000000..2997461b21 --- /dev/null +++ b/plugins/Morpheus/images/error.png diff --git a/plugins/Morpheus/images/error_medium.png b/plugins/Morpheus/images/error_medium.png Binary files differnew file mode 100644 index 0000000000..538cb9039f --- /dev/null +++ b/plugins/Morpheus/images/error_medium.png diff --git a/plugins/Morpheus/images/event.png b/plugins/Morpheus/images/event.png Binary files differnew file mode 100644 index 0000000000..ad4b38a01b --- /dev/null +++ b/plugins/Morpheus/images/event.png diff --git a/plugins/Morpheus/images/expanded_arrows.gif b/plugins/Morpheus/images/expanded_arrows.gif Binary files differnew file mode 100644 index 0000000000..ed33959206 --- /dev/null +++ b/plugins/Morpheus/images/expanded_arrows.gif diff --git a/plugins/Morpheus/images/feed.png b/plugins/Morpheus/images/feed.png Binary files differnew file mode 100644 index 0000000000..315c4f4fa6 --- /dev/null +++ b/plugins/Morpheus/images/feed.png diff --git a/plugins/Morpheus/images/fullscreen.png b/plugins/Morpheus/images/fullscreen.png Binary files differnew file mode 100755 index 0000000000..3c3273ba9d --- /dev/null +++ b/plugins/Morpheus/images/fullscreen.png diff --git a/plugins/Morpheus/images/html_icon.png b/plugins/Morpheus/images/html_icon.png Binary files differnew file mode 100644 index 0000000000..7b4308d885 --- /dev/null +++ b/plugins/Morpheus/images/html_icon.png diff --git a/plugins/Morpheus/images/ico_alert.png b/plugins/Morpheus/images/ico_alert.png Binary files differnew file mode 100644 index 0000000000..b8087eba9c --- /dev/null +++ b/plugins/Morpheus/images/ico_alert.png diff --git a/plugins/Morpheus/images/ico_info.png b/plugins/Morpheus/images/ico_info.png Binary files differnew file mode 100644 index 0000000000..1278cef852 --- /dev/null +++ b/plugins/Morpheus/images/ico_info.png diff --git a/plugins/Morpheus/images/inp_bg.png b/plugins/Morpheus/images/inp_bg.png Binary files differnew file mode 100644 index 0000000000..6bd9674743 --- /dev/null +++ b/plugins/Morpheus/images/inp_bg.png diff --git a/plugins/Morpheus/images/li_dbl_gray.gif b/plugins/Morpheus/images/li_dbl_gray.gif Binary files differnew file mode 100644 index 0000000000..42fe8b3b89 --- /dev/null +++ b/plugins/Morpheus/images/li_dbl_gray.gif diff --git a/plugins/Morpheus/images/login-sprite.png b/plugins/Morpheus/images/login-sprite.png Binary files differnew file mode 100644 index 0000000000..1692e4b09b --- /dev/null +++ b/plugins/Morpheus/images/login-sprite.png diff --git a/plugins/Morpheus/images/logo-marketplace.png b/plugins/Morpheus/images/logo-marketplace.png Binary files differnew file mode 100644 index 0000000000..d28491d73f --- /dev/null +++ b/plugins/Morpheus/images/logo-marketplace.png diff --git a/plugins/Morpheus/images/minus.png b/plugins/Morpheus/images/minus.png Binary files differnew file mode 100644 index 0000000000..48a507df9b --- /dev/null +++ b/plugins/Morpheus/images/minus.png diff --git a/plugins/Morpheus/images/newtab.png b/plugins/Morpheus/images/newtab.png Binary files differnew file mode 100755 index 0000000000..1e50c59200 --- /dev/null +++ b/plugins/Morpheus/images/newtab.png diff --git a/plugins/Morpheus/images/ok.png b/plugins/Morpheus/images/ok.png Binary files differnew file mode 100644 index 0000000000..148319419d --- /dev/null +++ b/plugins/Morpheus/images/ok.png diff --git a/plugins/Morpheus/images/paypal_subscribe.gif b/plugins/Morpheus/images/paypal_subscribe.gif Binary files differnew file mode 100755 index 0000000000..50d8ee52e9 --- /dev/null +++ b/plugins/Morpheus/images/paypal_subscribe.gif diff --git a/plugins/Morpheus/images/plus.png b/plugins/Morpheus/images/plus.png Binary files differnew file mode 100644 index 0000000000..7216c7d7a9 --- /dev/null +++ b/plugins/Morpheus/images/plus.png diff --git a/plugins/Morpheus/images/plus_blue.png b/plugins/Morpheus/images/plus_blue.png Binary files differnew file mode 100755 index 0000000000..bf16b7512a --- /dev/null +++ b/plugins/Morpheus/images/plus_blue.png diff --git a/plugins/Morpheus/images/reload.png b/plugins/Morpheus/images/reload.png Binary files differnew file mode 100755 index 0000000000..a77ffe7c64 --- /dev/null +++ b/plugins/Morpheus/images/reload.png diff --git a/plugins/Morpheus/images/row_evolution.png b/plugins/Morpheus/images/row_evolution.png Binary files differnew file mode 100644 index 0000000000..7423c473cc --- /dev/null +++ b/plugins/Morpheus/images/row_evolution.png diff --git a/plugins/Morpheus/images/row_evolution_hover.png b/plugins/Morpheus/images/row_evolution_hover.png Binary files differnew file mode 100755 index 0000000000..53827ae4df --- /dev/null +++ b/plugins/Morpheus/images/row_evolution_hover.png diff --git a/plugins/Morpheus/images/search_bg.png b/plugins/Morpheus/images/search_bg.png Binary files differnew file mode 100644 index 0000000000..7688b8080b --- /dev/null +++ b/plugins/Morpheus/images/search_bg.png diff --git a/plugins/Morpheus/images/sites_selection.png b/plugins/Morpheus/images/sites_selection.png Binary files differnew file mode 100644 index 0000000000..15750a63d8 --- /dev/null +++ b/plugins/Morpheus/images/sites_selection.png diff --git a/plugins/Morpheus/images/smileyprog_0.png b/plugins/Morpheus/images/smileyprog_0.png Binary files differnew file mode 100755 index 0000000000..8a4627eea3 --- /dev/null +++ b/plugins/Morpheus/images/smileyprog_0.png diff --git a/plugins/Morpheus/images/smileyprog_1.png b/plugins/Morpheus/images/smileyprog_1.png Binary files differnew file mode 100755 index 0000000000..5b16b257ae --- /dev/null +++ b/plugins/Morpheus/images/smileyprog_1.png diff --git a/plugins/Morpheus/images/smileyprog_2.png b/plugins/Morpheus/images/smileyprog_2.png Binary files differnew file mode 100755 index 0000000000..55537fb732 --- /dev/null +++ b/plugins/Morpheus/images/smileyprog_2.png diff --git a/plugins/Morpheus/images/smileyprog_3.png b/plugins/Morpheus/images/smileyprog_3.png Binary files differnew file mode 100755 index 0000000000..3410a344be --- /dev/null +++ b/plugins/Morpheus/images/smileyprog_3.png diff --git a/plugins/Morpheus/images/smileyprog_4.png b/plugins/Morpheus/images/smileyprog_4.png Binary files differnew file mode 100755 index 0000000000..0facd94f85 --- /dev/null +++ b/plugins/Morpheus/images/smileyprog_4.png diff --git a/plugins/Morpheus/images/sort_subtable_asc.png b/plugins/Morpheus/images/sort_subtable_asc.png Binary files differnew file mode 100644 index 0000000000..e402026efe --- /dev/null +++ b/plugins/Morpheus/images/sort_subtable_asc.png diff --git a/plugins/Morpheus/images/sort_subtable_asc_light.png b/plugins/Morpheus/images/sort_subtable_asc_light.png Binary files differnew file mode 100755 index 0000000000..cad89bd570 --- /dev/null +++ b/plugins/Morpheus/images/sort_subtable_asc_light.png diff --git a/plugins/Morpheus/images/sort_subtable_desc_light.png b/plugins/Morpheus/images/sort_subtable_desc_light.png Binary files differnew file mode 100644 index 0000000000..5091fe6841 --- /dev/null +++ b/plugins/Morpheus/images/sort_subtable_desc_light.png diff --git a/plugins/Morpheus/images/star.png b/plugins/Morpheus/images/star.png Binary files differnew file mode 100755 index 0000000000..52d161eab4 --- /dev/null +++ b/plugins/Morpheus/images/star.png diff --git a/plugins/Morpheus/images/star_empty.png b/plugins/Morpheus/images/star_empty.png Binary files differnew file mode 100755 index 0000000000..965f4bacb8 --- /dev/null +++ b/plugins/Morpheus/images/star_empty.png diff --git a/plugins/Morpheus/images/success_medium.png b/plugins/Morpheus/images/success_medium.png Binary files differnew file mode 100644 index 0000000000..05a3a06be4 --- /dev/null +++ b/plugins/Morpheus/images/success_medium.png diff --git a/plugins/Morpheus/images/video_play.png b/plugins/Morpheus/images/video_play.png Binary files differnew file mode 100755 index 0000000000..7ca28d991f --- /dev/null +++ b/plugins/Morpheus/images/video_play.png diff --git a/plugins/Morpheus/images/warning.png b/plugins/Morpheus/images/warning.png Binary files differnew file mode 100644 index 0000000000..fd49f31f29 --- /dev/null +++ b/plugins/Morpheus/images/warning.png diff --git a/plugins/Morpheus/images/warning_medium.png b/plugins/Morpheus/images/warning_medium.png Binary files differnew file mode 100644 index 0000000000..62bd22dc5c --- /dev/null +++ b/plugins/Morpheus/images/warning_medium.png diff --git a/plugins/Morpheus/images/warning_small.png b/plugins/Morpheus/images/warning_small.png Binary files differnew file mode 100644 index 0000000000..1242b4f180 --- /dev/null +++ b/plugins/Morpheus/images/warning_small.png diff --git a/plugins/Zeitgeist/javascripts/ajaxHelper.js b/plugins/Morpheus/javascripts/ajaxHelper.js index ee5fbfec38..ee5fbfec38 100644 --- a/plugins/Zeitgeist/javascripts/ajaxHelper.js +++ b/plugins/Morpheus/javascripts/ajaxHelper.js diff --git a/plugins/Zeitgeist/javascripts/piwikHelper.js b/plugins/Morpheus/javascripts/piwikHelper.js index 1aaf661124..1aaf661124 100644 --- a/plugins/Zeitgeist/javascripts/piwikHelper.js +++ b/plugins/Morpheus/javascripts/piwikHelper.js diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less index fdbf4532ae..d08fa44d3c 100644 --- a/plugins/Morpheus/stylesheets/theme.less +++ b/plugins/Morpheus/stylesheets/theme.less @@ -629,7 +629,7 @@ div.sparkline { padding: 0px !important; position: relative; right: 33px; - background: no-repeat 0px 7px url('plugins/Zeitgeist/images/search_ico.png') !important; + background: no-repeat 0px 7px url('plugins/Morpheus/images/search_ico.png') !important; text-indent: 999999px; width: 17px !important; } diff --git a/plugins/Morpheus/stylesheets/ui/_components.less b/plugins/Morpheus/stylesheets/ui/_components.less index a4d706117d..0bad34c66f 100644 --- a/plugins/Morpheus/stylesheets/ui/_components.less +++ b/plugins/Morpheus/stylesheets/ui/_components.less @@ -138,7 +138,7 @@ a.dropdown { color: @theme-color-text; - background: url('plugins/Zeitgeist/images/sort_subtable_desc.png') 100% -2px no-repeat; + background: url('plugins/Morpheus/images/sort_subtable_desc.png') 100% -2px no-repeat; &.ui-autocomplete-input { background-position: 100% -2px; } diff --git a/plugins/Zeitgeist/templates/_iframeBuster.twig b/plugins/Morpheus/templates/_iframeBuster.twig index b7c1b3784b..b7c1b3784b 100644 --- a/plugins/Zeitgeist/templates/_iframeBuster.twig +++ b/plugins/Morpheus/templates/_iframeBuster.twig diff --git a/plugins/Zeitgeist/templates/_jsCssIncludes.twig b/plugins/Morpheus/templates/_jsCssIncludes.twig index eb9a3cdbb1..eb9a3cdbb1 100644 --- a/plugins/Zeitgeist/templates/_jsCssIncludes.twig +++ b/plugins/Morpheus/templates/_jsCssIncludes.twig diff --git a/plugins/Zeitgeist/templates/_jsGlobalVariables.twig b/plugins/Morpheus/templates/_jsGlobalVariables.twig index 35643089ea..35643089ea 100644 --- a/plugins/Zeitgeist/templates/_jsGlobalVariables.twig +++ b/plugins/Morpheus/templates/_jsGlobalVariables.twig diff --git a/plugins/Zeitgeist/templates/_piwikTag.twig b/plugins/Morpheus/templates/_piwikTag.twig index 98581d9ac5..98581d9ac5 100644 --- a/plugins/Zeitgeist/templates/_piwikTag.twig +++ b/plugins/Morpheus/templates/_piwikTag.twig diff --git a/plugins/Zeitgeist/templates/_sparklineFooter.twig b/plugins/Morpheus/templates/_sparklineFooter.twig index 60664aa216..60664aa216 100644 --- a/plugins/Zeitgeist/templates/_sparklineFooter.twig +++ b/plugins/Morpheus/templates/_sparklineFooter.twig diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Morpheus/templates/admin.twig index 012308bef7..012308bef7 100644 --- a/plugins/Zeitgeist/templates/admin.twig +++ b/plugins/Morpheus/templates/admin.twig diff --git a/plugins/Zeitgeist/templates/ajaxMacros.twig b/plugins/Morpheus/templates/ajaxMacros.twig index 919f352c18..eddeeab10e 100644 --- a/plugins/Zeitgeist/templates/ajaxMacros.twig +++ b/plugins/Morpheus/templates/ajaxMacros.twig @@ -5,7 +5,7 @@ {% macro loadingDiv(id='ajaxLoadingDiv') %} <div id="{{ id }}" style="display:none;"> <div class="loadingPiwik"> - <img src="plugins/Zeitgeist/images/loading-blue.gif" alt="{{ 'General_LoadingData'|translate }}" />{{ 'General_LoadingData'|translate }} + <img src="plugins/Morpheus/images/loading-blue.gif" alt="{{ 'General_LoadingData'|translate }}" />{{ 'General_LoadingData'|translate }} </div> <div class="loadingSegment"> {{ 'SegmentEditor_LoadingSegmentedDataMayTakeSomeTime'|translate }} diff --git a/plugins/Zeitgeist/templates/dashboard.twig b/plugins/Morpheus/templates/dashboard.twig index d0692097ec..d0692097ec 100644 --- a/plugins/Zeitgeist/templates/dashboard.twig +++ b/plugins/Morpheus/templates/dashboard.twig diff --git a/plugins/Zeitgeist/templates/empty.twig b/plugins/Morpheus/templates/empty.twig index 4275f80503..4275f80503 100644 --- a/plugins/Zeitgeist/templates/empty.twig +++ b/plugins/Morpheus/templates/empty.twig diff --git a/plugins/Zeitgeist/templates/genericForm.twig b/plugins/Morpheus/templates/genericForm.twig index e506f190aa..963684af59 100644 --- a/plugins/Zeitgeist/templates/genericForm.twig +++ b/plugins/Morpheus/templates/genericForm.twig @@ -1,6 +1,6 @@ {% if form_data.errors %} <div class="warning"> - <img src="plugins/Zeitgeist/images/warning_medium.png"> + <img src="plugins/Morpheus/images/warning_medium.png"> <strong>{{ 'Installation_PleaseFixTheFollowingErrors'|translate }}:</strong> <ul> {% for data in form_data.errors %} diff --git a/plugins/Zeitgeist/templates/javascriptCode.tpl b/plugins/Morpheus/templates/javascriptCode.tpl index 488f39d00c..488f39d00c 100644 --- a/plugins/Zeitgeist/templates/javascriptCode.tpl +++ b/plugins/Morpheus/templates/javascriptCode.tpl diff --git a/plugins/Zeitgeist/templates/macros.twig b/plugins/Morpheus/templates/macros.twig index 6a3b2e58b6..6a3b2e58b6 100644 --- a/plugins/Zeitgeist/templates/macros.twig +++ b/plugins/Morpheus/templates/macros.twig diff --git a/plugins/Zeitgeist/templates/simpleLayoutFooter.tpl b/plugins/Morpheus/templates/simpleLayoutFooter.tpl index 9943ff0f85..9943ff0f85 100644 --- a/plugins/Zeitgeist/templates/simpleLayoutFooter.tpl +++ b/plugins/Morpheus/templates/simpleLayoutFooter.tpl diff --git a/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl b/plugins/Morpheus/templates/simpleLayoutHeader.tpl index 9029a4d0dd..9029a4d0dd 100644 --- a/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl +++ b/plugins/Morpheus/templates/simpleLayoutHeader.tpl diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.html b/plugins/MultiSites/angularjs/dashboard/dashboard.html index 015b97dc02..2baf6d6e58 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.html @@ -114,7 +114,7 @@ <img title="Search" ng-show="!searchTerm" class="search_ico" - src="plugins/Zeitgeist/images/search_ico.png"/> + src="plugins/Morpheus/images/search_ico.png"/> <img title="Clear" ng-show="searchTerm" ng-click="searchTerm='';model.searchSite('')" diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.less b/plugins/MultiSites/angularjs/dashboard/dashboard.less index 042f5ac2cc..32da08d189 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.less +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.less @@ -153,7 +153,7 @@ } .allWebsitesLoadingIndicator { - background: url(plugins/Zeitgeist/images/loading-blue.gif) no-repeat right 3px; + background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat right 3px; display: inline-block; width: 16px; height: 16px; diff --git a/plugins/Overlay/stylesheets/overlay.css b/plugins/Overlay/stylesheets/overlay.css index f80a6a7f7e..dad014f634 100644 --- a/plugins/Overlay/stylesheets/overlay.css +++ b/plugins/Overlay/stylesheets/overlay.css @@ -36,7 +36,7 @@ a#Overlay_Title { #Overlay_DateRangeSelection { padding: 30px 0 20px 23px; - background: url(../../Zeitgeist/images/icon-calendar.gif) 2px 33px no-repeat; + background: url(../../Morpheus/images/icon-calendar.gif) 2px 33px no-repeat; margin-left: 5px; } @@ -48,7 +48,7 @@ a#Overlay_Title { } #Overlay_Loading { - background: url(../../Zeitgeist/images/loading-blue.gif) no-repeat center 10px; + background: url(../../Morpheus/images/loading-blue.gif) no-repeat center 10px; width: 190px; padding-top: 30px; margin-top: 30px; @@ -82,7 +82,7 @@ a#Overlay_Transitions { a#Overlay_RowEvolution { margin-top: 20px; - background: url(../../Zeitgeist/images/row_evolution_hover.png) no-repeat 0 7px; + background: url(../../Morpheus/images/row_evolution_hover.png) no-repeat 0 7px; } a#Overlay_Transitions { @@ -91,7 +91,7 @@ a#Overlay_Transitions { a#Overlay_FullScreen { margin-top: 20px; - background: url(../../Zeitgeist/images/fullscreen.png) no-repeat 3px 8px; + background: url(../../Morpheus/images/fullscreen.png) no-repeat 3px 8px; } a#Overlay_FullScreen:hover, diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig index 2b6b8976f3..27b37866ae 100644 --- a/plugins/Overlay/templates/index.twig +++ b/plugins/Overlay/templates/index.twig @@ -10,7 +10,7 @@ <div class="overlay-sidebar-container"> <a id="Overlay_Title" href="http://piwik.org/docs/page-overlay/" target="_blank"> {{ 'Overlay_Overlay'|translate }} - <img src="plugins/Zeitgeist/images/help.png" alt="Documentation"/> + <img src="plugins/Morpheus/images/help.png" alt="Documentation"/> </a> <div id="Overlay_DateRangeSelection"> diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index 40b575455d..c81a3d37b2 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -221,7 +221,7 @@ <td width="500"> <div id="deleteDataEstimate"></div> <span class="loadingPiwik" style="display:none;"><img - src="./plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> + src="./plugins/Morpheus/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> </td> <td width="200"> {% if deleteData.config.enable_auto_database_size_estimate == '0' %} @@ -258,7 +258,7 @@ <br/> <em><a id="purgeDataNowLink" href="#">{{ 'PrivacyManager_PurgeNow'|translate }}</a></em> <span class="loadingPiwik" style="display:none;"><img - src="./plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'PrivacyManager_PurgingData'|translate }}</span> + src="./plugins/Morpheus/images/loading-blue.gif"/> {{ 'PrivacyManager_PurgingData'|translate }}</span> <span id="db-purged-message" style="display: none;"><em>{{ 'PrivacyManager_DBPurged'|translate }}</em></span> {% endset %} {{ piwik.inlineHelp(purgeStats) }} diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php index 580056aca7..db702aaf44 100644 --- a/plugins/ScheduledReports/ScheduledReports.php +++ b/plugins/ScheduledReports/ScheduledReports.php @@ -61,11 +61,11 @@ class ScheduledReports extends \Piwik\Plugin ); static private $managedReportTypes = array( - self::EMAIL_TYPE => 'plugins/Zeitgeist/images/email.png' + self::EMAIL_TYPE => 'plugins/Morpheus/images/email.png' ); static private $managedReportFormats = array( - ReportRenderer::HTML_FORMAT => 'plugins/Zeitgeist/images/html_icon.png', + ReportRenderer::HTML_FORMAT => 'plugins/Morpheus/images/html_icon.png', ReportRenderer::PDF_FORMAT => 'plugins/UserSettings/images/plugins/pdf.gif', ReportRenderer::CSV_FORMAT => 'plugins/Morpheus/images/export.png', ); diff --git a/plugins/ScheduledReports/templates/_listReports.twig b/plugins/ScheduledReports/templates/_listReports.twig index 3ca01e9c0a..328a16bc6a 100644 --- a/plugins/ScheduledReports/templates/_listReports.twig +++ b/plugins/ScheduledReports/templates/_listReports.twig @@ -79,14 +79,14 @@ <td> {# edit link #} <a href='#' name="linkEditReport" id="{{ report.idreport }}" class="link_but"> - <img src='plugins/Zeitgeist/images/ico_edit.png' border="0"/> + <img src='plugins/Morpheus/images/ico_edit.png' border="0"/> {{ 'General_Edit'|translate }} </a> </td> <td> {# delete link #} <a href='#' name="linkDeleteReport" id="{{ report.idreport }}" class="link_but"> - <img src='plugins/Zeitgeist/images/ico_delete.png' border="0"/> + <img src='plugins/Morpheus/images/ico_delete.png' border="0"/> {{ 'General_Delete'|translate }} </a> </td> diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less index 82312fcb1c..cab2ca2098 100644 --- a/plugins/SegmentEditor/stylesheets/segmentation.less +++ b/plugins/SegmentEditor/stylesheets/segmentation.less @@ -536,7 +536,7 @@ div.scrollable { } span.segmentationTitle { - background: url(plugins/Zeitgeist/images/sort_subtable_desc.png) no-repeat right 0; + background: url(plugins/Morpheus/images/sort_subtable_desc.png) no-repeat right 0; padding-right: 20px; width: 160px; display: block; @@ -618,7 +618,7 @@ a.metric_category { } .available_segments a.dropdown { - background: url("plugins/Zeitgeist/images/sort_subtable_desc.png") no-repeat scroll 100% -2px transparent !important; + background: url("plugins/Morpheus/images/sort_subtable_desc.png") no-repeat scroll 100% -2px transparent !important; padding: 0 17px 0 0 !important; } diff --git a/plugins/SitesManager/templates/global-settings.twig b/plugins/SitesManager/templates/global-settings.twig index c18deb5076..2d69ee15e3 100644 --- a/plugins/SitesManager/templates/global-settings.twig +++ b/plugins/SitesManager/templates/global-settings.twig @@ -69,7 +69,7 @@ {{ 'SitesManager_EnableSiteSpecificUserAgentExclude'|translate }} </label> <span id="enableSiteUserAgentExclude-loading" class="loadingPiwik" style="display:none;"> - <img src="plugins/Zeitgeist/images/loading-blue.gif"/> + <img src="plugins/Morpheus/images/loading-blue.gif"/> </span> </td> <td> diff --git a/plugins/SitesManager/templates/sites-management.twig b/plugins/SitesManager/templates/sites-management.twig index 467def9649..70fcf31d0a 100644 --- a/plugins/SitesManager/templates/sites-management.twig +++ b/plugins/SitesManager/templates/sites-management.twig @@ -89,14 +89,14 @@ </td> <td> <span id="row{{ site.idsite }}" class='editSite link_but'> - <img src='plugins/Zeitgeist/images/ico_edit.png' title="{{ 'General_Edit'|translate }}" + <img src='plugins/Morpheus/images/ico_edit.png' title="{{ 'General_Edit'|translate }}" border="0"/> <span>{{ 'General_Edit'|translate }}</span> </span> </td> <td> <span id="row{{ site.idsite }}" class="deleteSite link_but"> - <img src='plugins/Zeitgeist/images/ico_delete.png' title="{{ 'General_Delete'|translate }}" + <img src='plugins/Morpheus/images/ico_delete.png' title="{{ 'General_Delete'|translate }}" border="0"/> <span>{{ 'General_Delete'|translate }}</span> </span> diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js index 30521acada..e6c461b373 100644 --- a/plugins/Transitions/javascripts/transitions.js +++ b/plugins/Transitions/javascripts/transitions.js @@ -616,7 +616,7 @@ Piwik_Transitions.prototype.renderClosedGroup = function (groupName, side, onlyB boxText: self.model.getGroupTitle(groupName), boxTextNumLines: 1, boxTextCssClass: 'SingleLine', - boxIcon: 'plugins/Zeitgeist/images/plus_blue.png', + boxIcon: 'plugins/Morpheus/images/plus_blue.png', smallBox: true, onClick: function () { self.unHighlightGroup(groupName, side); diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig index 56bdb97886..65d83cba31 100755 --- a/plugins/UserCountry/templates/adminIndex.twig +++ b/plugins/UserCountry/templates/adminIndex.twig @@ -36,7 +36,7 @@ <input class="location-provider" name="location-provider" value="{{ id }}" type="radio" {% if currentProviderId == id %}checked="checked"{% endif %} id="provider_input_{{ id }}" {% if provider.status != 1 %}disabled="disabled"{% endif %}/> <label for="provider_input_{{ id }}">{{ provider.title|translate }}</label><br/> - <span class="loadingPiwik" style="display:none;"><img src="./plugins/Zeitgeist/images/loading-blue.gif"/></span> + <span class="loadingPiwik" style="display:none;"><img src="./plugins/Morpheus/images/loading-blue.gif"/></span> <span class="success" ></span> </p> @@ -66,7 +66,7 @@ <div style="text-align:left;"> <br/> <span class="loadingPiwik" style="display:none;position:absolute;"> - <img src="./plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_Loading'|translate }}</span> + <img src="./plugins/Morpheus/images/loading-blue.gif"/> {{ 'General_Loading'|translate }}</span> <span class="location"><strong><em>{{ provider.location|raw }}</em></strong></span> </div> <div style="text-align:right;"> @@ -120,7 +120,7 @@ </div> </div> <div id="geoipdb-screen2-download" style="display:none;"> - <p class='loadingPiwik'><img src='./plugins/Zeitgeist/images/loading-blue.gif'/> + <p class='loadingPiwik'><img src='./plugins/Morpheus/images/loading-blue.gif'/> {{ 'UserCountry_DownloadingDb'|translate('<a href="'~geoLiteUrl~'">GeoLiteCity.dat</a>')|raw }}...</p> <div id="geoip-download-progress"></div> </div> diff --git a/plugins/UserCountryMap/templates/realtimeMap.twig b/plugins/UserCountryMap/templates/realtimeMap.twig index e254bc313a..e44ed78a38 100644 --- a/plugins/UserCountryMap/templates/realtimeMap.twig +++ b/plugins/UserCountryMap/templates/realtimeMap.twig @@ -21,7 +21,7 @@ </div> <div class="RealTimeMap_meta"> <span class="loadingPiwik"> - <img src="plugins/Zeitgeist/images/loading-blue.gif"> {{ 'General_LoadingData'|translate }}... + <img src="plugins/Morpheus/images/loading-blue.gif"> {{ 'General_LoadingData'|translate }}... </span> </div> diff --git a/plugins/UserCountryMap/templates/visitorMap.twig b/plugins/UserCountryMap/templates/visitorMap.twig index a5149c0777..4d76eebb74 100644 --- a/plugins/UserCountryMap/templates/visitorMap.twig +++ b/plugins/UserCountryMap/templates/visitorMap.twig @@ -22,7 +22,7 @@ <div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div> {% else %} <span class="loadingPiwik"> - <img src="plugins/Zeitgeist/images/loading-blue.gif" /> + <img src="plugins/Morpheus/images/loading-blue.gif" /> {{ 'General_LoadingData'|translate }}... </span> {% endif %} @@ -30,12 +30,12 @@ <div class="dataTableFeatures" style="padding-top:0;"> <div class="dataTableFooterIcons"> <div class="dataTableFooterWrap" var="graphVerticalBar"> - <img class="UserCountryMap-activeItem dataTableFooterActiveItem" src="plugins/Zeitgeist/images/data_table_footer_active_item.png" style="left: 25px;" /> + <img class="UserCountryMap-activeItem dataTableFooterActiveItem" src="plugins/Morpheus/images/data_table_footer_active_item.png" style="left: 25px;" /> <div class="tableIconsGroup"> <span class="tableAllColumnsSwitch"> <a class="UserCountryMap-btn-zoom tableIcon" format="table"> - <img src="plugins/Zeitgeist/images/zoom-out.png" title="Zoom to world" /> + <img src="plugins/Morpheus/images/zoom-out.png" title="Zoom to world" /> </a> </span> </div> diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig index 4f943c5dfd..f8d374a67a 100644 --- a/plugins/UsersManager/templates/index.twig +++ b/plugins/UsersManager/templates/index.twig @@ -141,13 +141,13 @@ {% endif %} <td> <span class="edituser link_but" id="row{{ i }}"> - <img title="{{ 'General_Edit'|translate }}" src='plugins/Zeitgeist/images/ico_edit.png'/> + <img title="{{ 'General_Edit'|translate }}" src='plugins/Morpheus/images/ico_edit.png'/> <span>{{ 'General_Edit'|translate }}</span> </span> </td> <td> <span class="deleteuser link_but" id="row{{ i }}"> - <img title="{{ 'General_Delete'|translate }}" src='plugins/Zeitgeist/images/ico_delete.png'/> + <img title="{{ 'General_Delete'|translate }}" src='plugins/Morpheus/images/ico_delete.png'/> <span>{{ 'General_Delete'|translate }}</span> </span> </td> diff --git a/plugins/Widgetize/Widgetize.php b/plugins/Widgetize/Widgetize.php index f0abcfb87a..119da54d52 100644 --- a/plugins/Widgetize/Widgetize.php +++ b/plugins/Widgetize/Widgetize.php @@ -42,7 +42,7 @@ class Widgetize extends \Piwik\Plugin { $jsFiles[] = "libs/jquery/jquery.truncate.js"; $jsFiles[] = "libs/jquery/jquery.scrollTo.js"; - $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js"; + $jsFiles[] = "plugins/Morpheus/javascripts/piwikHelper.js"; $jsFiles[] = "plugins/CoreHome/javascripts/dataTable.js"; $jsFiles[] = "plugins/Dashboard/javascripts/widgetMenu.js"; $jsFiles[] = "plugins/Widgetize/javascripts/widgetize.js"; diff --git a/plugins/Zeitgeist/stylesheets/general/_default.less b/plugins/Zeitgeist/stylesheets/general/_default.less index 626908948d..002551ecd1 100644 --- a/plugins/Zeitgeist/stylesheets/general/_default.less +++ b/plugins/Zeitgeist/stylesheets/general/_default.less @@ -75,7 +75,7 @@ textarea { input, select, textarea { border-radius: 4px; border: 1px solid #d4d4d4; - background: #fff url(plugins/Zeitgeist/images/inp_bg.png) repeat-x 0 0; + background: #fff url(plugins/Morpheus/images/inp_bg.png) repeat-x 0 0; padding: 3px 10px; color: #255792; margin-bottom: 3px; diff --git a/plugins/Zeitgeist/stylesheets/general/_form.less b/plugins/Zeitgeist/stylesheets/general/_form.less index c129e8c407..bca953f158 100644 --- a/plugins/Zeitgeist/stylesheets/general/_form.less +++ b/plugins/Zeitgeist/stylesheets/general/_form.less @@ -5,7 +5,7 @@ padding: 3px 10px; border-radius: 4px; border: 0; - background: #847b6d url(plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0; + background: #847b6d url(plugins/Morpheus/images/dashboard_h_bg_hover.png) repeat-x 0 0; float: right; margin: 12px 0 10px 0; cursor: pointer; @@ -106,7 +106,7 @@ table.entityTable tr td a { } .entityList ul li { - background: #fff url(plugins/Zeitgeist/images/li_dbl_gray.gif) no-repeat 6px 10px; + background: #fff url(plugins/Morpheus/images/li_dbl_gray.gif) no-repeat 6px 10px; padding: 0 0 0 21px; line-height: 22px; } diff --git a/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less b/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less index 647303faa7..9242d984eb 100644 --- a/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less +++ b/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less @@ -78,7 +78,7 @@ div.ui-state-highlight { } .ui-datepicker-header { - background: #847b6d url(plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0 !important; + background: #847b6d url(plugins/Morpheus/images/dashboard_h_bg_hover.png) repeat-x 0 0 !important; color: #fff !important; border-radius: 0 !important; } @@ -254,7 +254,7 @@ body .ui-tooltip.small { margin: -8px 0 0 0; padding: 0; height: 16px; - background: url(plugins/Zeitgeist/images/help.png); + background: url(plugins/Morpheus/images/help.png); overflow: hidden; } diff --git a/plugins/Zeitgeist/stylesheets/ui/_headerMessage.less b/plugins/Zeitgeist/stylesheets/ui/_headerMessage.less index 95d3a30888..e2f9a13997 100644 --- a/plugins/Zeitgeist/stylesheets/ui/_headerMessage.less +++ b/plugins/Zeitgeist/stylesheets/ui/_headerMessage.less @@ -46,7 +46,7 @@ /* Orange alerts box */ .header_alert { - background: #FFFDF7 url(plugins/Zeitgeist/images/ico_alert.png) no-repeat 7px 4px; + background: #FFFDF7 url(plugins/Morpheus/images/ico_alert.png) no-repeat 7px 4px; border: 1px solid #FF7F00; font-weight: bold; } @@ -58,7 +58,7 @@ /* Blue info box */ .header_info { - background: #FAFAFA url(plugins/Zeitgeist/images/ico_info.png) no-repeat 7px 4px; + background: #FAFAFA url(plugins/Morpheus/images/ico_info.png) no-repeat 7px 4px; border: 1px solid #CBD9EB; } diff --git a/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less b/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less index 35c7485abd..767a2a70a1 100644 --- a/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less +++ b/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less @@ -24,7 +24,7 @@ position:absolute; right:9px; top:7px; - background: url("plugins/Zeitgeist/images/icon-calendar.gif") no-repeat scroll; + background: url("plugins/Morpheus/images/icon-calendar.gif") no-repeat scroll; cursor:pointer; } diff --git a/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less b/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less index 4bd6f1d7b2..f52528a223 100644 --- a/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less +++ b/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less @@ -36,7 +36,7 @@ float: left; position: relative; z-index: 19; - background: #fff url(plugins/Zeitgeist/images/sites_selection.png) repeat-x 0 0; + background: #fff url(plugins/Morpheus/images/sites_selection.png) repeat-x 0 0; border: 1px solid #d4d4d4; color: #255792; border-radius: 4px; @@ -79,7 +79,7 @@ } .sites_autocomplete .custom_select_main_link.loading { - background: url(plugins/Zeitgeist/images/loading-blue.gif) no-repeat right 3px; + background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat right 3px; } .sites_autocomplete .custom_select_ul_list, @@ -113,7 +113,7 @@ height: 26px; display: block; white-space: nowrap; - background: url(plugins/Zeitgeist/images/search_bg.png) no-repeat 0 0; + background: url(plugins/Morpheus/images/search_bg.png) no-repeat 0 0; } .sites_autocomplete .custom_select_search .inp { |
