From 5f4e034e2454c9d1bb591badb308de7e07ca6d8f Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Mon, 20 Oct 2014 23:39:30 +0200
Subject: [PATCH] refs #6469 move css file back where it was placed before
maybe this makes ui tests fast again
---
libs/jquery/{stylesheets => themes/base}/jquery-ui.min.css | 0
plugins/CoreAdminHome/CoreAdminHome.php | 2 +-
plugins/CoreHome/CoreHome.php | 2 +-
plugins/CoreUpdater/templates/layout.twig | 2 +-
plugins/Installation/templates/layout.twig | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
rename libs/jquery/{stylesheets => themes/base}/jquery-ui.min.css (100%)
diff --git a/libs/jquery/stylesheets/jquery-ui.min.css b/libs/jquery/themes/base/jquery-ui.min.css
similarity index 100%
rename from libs/jquery/stylesheets/jquery-ui.min.css
rename to libs/jquery/themes/base/jquery-ui.min.css
diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php
index c5ccc8153e..5351aca48f 100644
--- a/plugins/CoreAdminHome/CoreAdminHome.php
+++ b/plugins/CoreAdminHome/CoreAdminHome.php
@@ -35,7 +35,7 @@ class CoreAdminHome extends \Piwik\Plugin
public function getStylesheetFiles(&$stylesheets)
{
- $stylesheets[] = "libs/jquery/stylesheets/jquery-ui.min.css";
+ $stylesheets[] = "libs/jquery/themes/base/jquery-ui.min.css";
$stylesheets[] = "plugins/CoreAdminHome/stylesheets/menu.less";
$stylesheets[] = "plugins/Morpheus/stylesheets/base.less";
$stylesheets[] = "plugins/Morpheus/stylesheets/theme.less";
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 227ea70bd8..62ef2a935c 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -47,7 +47,7 @@ class CoreHome extends \Piwik\Plugin
public function getStylesheetFiles(&$stylesheets)
{
- $stylesheets[] = "libs/jquery/stylesheets/jquery-ui.min.css";
+ $stylesheets[] = "libs/jquery/themes/base/jquery-ui.min.css";
$stylesheets[] = "libs/jquery/stylesheets/jquery.jscrollpane.css";
$stylesheets[] = "libs/jquery/stylesheets/scroll.less";
$stylesheets[] = "libs/bower_components/ngDialog/css/ngDialog.min.css";
diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig
index 892e3666cd..bed37363f7 100644
--- a/plugins/CoreUpdater/templates/layout.twig
+++ b/plugins/CoreUpdater/templates/layout.twig
@@ -9,7 +9,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1"/>
<meta name="viewport" content="initial-scale=1.0" />
- <link rel="stylesheet" type="text/css" href="libs/jquery/stylesheets/jquery-ui.min.css"/>
+ <link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.min.css"/>
<link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getBaseCss"/>
<link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/simple_structure.css"/>
<link rel="stylesheet" type="text/css" href="plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css" />
diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig
index d2b61c85c6..c783b1b316 100644
--- a/plugins/Installation/templates/layout.twig
+++ b/plugins/Installation/templates/layout.twig
@@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<title>Piwik › {{ 'Installation_Installation'|translate }}</title>
- <link rel="stylesheet" type="text/css" href="libs/jquery/stylesheets/jquery-ui.min.css"/>
+ <link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.min.css"/>
<link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getBaseCss"/>
<link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
<script type="text/javascript" src="libs/bower_components/jquery/dist/jquery.min.js"></script>
--
GitLab