aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/themes/default/images/jgrowl-alert.pngbin2596 -> 0 bytes
-rw-r--r--admin/themes/default/images/jgrowl-check.pngbin2412 -> 0 bytes
-rw-r--r--admin/themes/default/images/jgrowl-error.pngbin2446 -> 0 bytes
-rw-r--r--admin/themes/default/template/photos_add_direct.tpl2
-rw-r--r--admin/themes/default/template/updates_ext.tpl2
-rw-r--r--admin/themes/default/uploadify.jGrowl.css150
6 files changed, 2 insertions, 152 deletions
diff --git a/admin/themes/default/images/jgrowl-alert.png b/admin/themes/default/images/jgrowl-alert.png
deleted file mode 100644
index 388fcbb81..000000000
--- a/admin/themes/default/images/jgrowl-alert.png
+++ /dev/null
Binary files differ
diff --git a/admin/themes/default/images/jgrowl-check.png b/admin/themes/default/images/jgrowl-check.png
deleted file mode 100644
index b6a649a1b..000000000
--- a/admin/themes/default/images/jgrowl-check.png
+++ /dev/null
Binary files differ
diff --git a/admin/themes/default/images/jgrowl-error.png b/admin/themes/default/images/jgrowl-error.png
deleted file mode 100644
index 48ef138c7..000000000
--- a/admin/themes/default/images/jgrowl-error.png
+++ /dev/null
Binary files differ
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 54186cd64..407618e80 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -2,7 +2,7 @@
{combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js' }
{combine_script id='jquery.uploadify' load='footer' require='jquery' path='admin/include/uploadify/jquery.uploadify.v3.0.0.min.js' }
{combine_script id='jquery.ui.progressbar' load='footer'}
-{combine_css path="admin/themes/default/uploadify.jGrowl.css"}
+{combine_css path="themes/default/js/plugins/jquery.jgrowl.css"}
{combine_css path="admin/include/uploadify/uploadify.css"}
{/if}
diff --git a/admin/themes/default/template/updates_ext.tpl b/admin/themes/default/template/updates_ext.tpl
index 9946d824f..d58a42397 100644
--- a/admin/themes/default/template/updates_ext.tpl
+++ b/admin/themes/default/template/updates_ext.tpl
@@ -1,6 +1,6 @@
{combine_script id='jquery.ajaxmanager' load='footer' require='jquery' path='themes/default/js/plugins/jquery.ajaxmanager.js'}
{combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'}
-{combine_css path="admin/themes/default/uploadify.jGrowl.css"}
+{combine_css path="themes/default/js/plugins/jquery.jgrowl.css"}
{footer_script require='jquery.ui.effect-blind,jquery.ajaxmanager,jquery.jgrowl'}
var pwg_token = '{$PWG_TOKEN}';
diff --git a/admin/themes/default/uploadify.jGrowl.css b/admin/themes/default/uploadify.jGrowl.css
deleted file mode 100644
index 44216e6b1..000000000
--- a/admin/themes/default/uploadify.jGrowl.css
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-Default jGrowl style definitions for:
-
-Uploadify v1.6.2
-Copyright (C) 2009 by Ronnie Garcia
-Co-developed by Travis Nickels
-*/
-
-/** Uploadify Styling here Styling **/
-div.jGrowl div.success {
- background: url(images/jgrowl-check.png) no-repeat 6px 6px;
-}
-div.jGrowl div.error {
- background: url(images/jgrowl-error.png) no-repeat 6px center;
-}
-div.jGrowl div.warning {
- background: url(images/jgrowl-alert.png) no-repeat 6px 6px;
-}
-div.jGrowl div.warning:before {
- content:none;
-}
-
-div.jGrowl div.jGrowl-notification, div.jGrowl div.jGrowl-closer {
- background-color: #000;
- color: #fff;
- opacity: .85;
- filter: alpha(opacity = 85);
- zoom: 1;
- width: 300px;
- padding: 10px;
- margin-top: 5px;
- margin-bottom: 5px;
- font-family: Tahoma, Arial, Helvetica, sans-serif;
- font-size: 12px;
- text-align: left;
- display: none;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
-
-/* original jGrowl css styling */
-
-div.center div.jGrowl-notification, div.center div.jGrowl-closer {
- margin-left: auto;
- margin-right: auto;
-}
-
-div.jGrowl div.jGrowl-notification {
- min-height: 40px;
-}
-
-div.jGrowl div.jGrowl-notification div.close {
- float: right;
- font-weight: bold;
- font-size: 12px;
- cursor: pointer;
-}
-
-div.jGrowl div.jGrowl-closer {
- height: 15px;
- padding-top: 4px;
- padding-bottom: 4px;
- cursor: pointer;
- font-size: 11px;
- font-weight: bold;
- text-align: center;
-}
-
-div.jGrowl div.jGrowl-notification div.header {
- font-weight: bold;
- font-size: 14px;
- margin-left: 47px;
-}
-div.jGrowl div.jGrowl-notification div.message {
- font-size: 12px;
- margin-left: 47px;
-}
-div.jGrowl div.jGrowl-notification p {
- font-size: 6px;
-}
-
-div.jGrowl {
- padding: 10px;
- z-index: 9999;
-}
-
-/** Special IE6 Style Positioning **/
-div.ie6 {
- position: absolute;
-}
-
-div.ie6.top-right {
- right: auto;
- bottom: auto;
- left: expression( ( 0 - jGrowl.offsetWidth + ( document.documentElement.clientWidth ? document.documentElement.clientWidth : document.body.clientWidth ) + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' );
- top: expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' );
-}
-
-div.ie6.top-left {
- left: expression( ( 0 + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' );
- top: expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' );
-}
-
-div.ie6.bottom-right {
- left: expression( ( 0 - jGrowl.offsetWidth + ( document.documentElement.clientWidth ? document.documentElement.clientWidth : document.body.clientWidth ) + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' );
- top: expression( ( 0 - jGrowl.offsetHeight + ( document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' );
-}
-
-div.ie6.bottom-left {
- left: expression( ( 0 + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' );
- top: expression( ( 0 - jGrowl.offsetHeight + ( document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' );
-}
-
-div.ie6.center {
- left: expression( ( 0 + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' );
- top: expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' );
- width: 100%;
-}
-
-/** Normal Style Positions **/
-body > div.jGrowl {
- position: fixed;
-}
-
-body > div.jGrowl.top-left {
- left: 0px;
- top: 0px;
-}
-
-body > div.jGrowl.top-right {
- right: 0px;
- top: 0px;
-}
-
-body > div.jGrowl.bottom-left {
- left: 0px;
- bottom: 0px;
-}
-
-body > div.jGrowl.bottom-right {
- right: 0px;
- bottom: 0px;
-}
-
-body > div.jGrowl.center {
- top: 0px;
- width: 50%;
- left: 25%;
-}
-