From 4a61a47719c1347844d0b4e84842d9551aa1f649 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Sat, 10 Nov 2012 11:20:03 +1300 Subject: [PATCH] FIX: remove ssorgtheme, use all styles from docviewer --- app/code/ControllerExtension.php | 28 +- themes/docs/templates/DocumentationViewer.ss | 58 +-- .../templates/Layout/DocumentationViewer.ss | 14 +- themes/ssorgsites/README.md | 21 - themes/ssorgsites/css/core.css | 436 ------------------ themes/ssorgsites/css/form.css | 3 - themes/ssorgsites/css/grid.css | 30 -- themes/ssorgsites/css/print.css | 9 - themes/ssorgsites/css/ss.print.min.css | 1 - themes/ssorgsites/css/ss.screen.min.css | 200 -------- themes/ssorgsites/css/typography.css | 198 -------- themes/ssorgsites/images/bullet.gif | Bin 81 -> 0 bytes themes/ssorgsites/images/error_button.png | Bin 3618 -> 0 bytes themes/ssorgsites/images/external_link.png | Bin 144 -> 0 bytes themes/ssorgsites/images/ico_close_off.png | Bin 239 -> 0 bytes .../ssorgsites/images/icons/application.png | Bin 464 -> 0 bytes themes/ssorgsites/images/icons/page_excel.png | Bin 817 -> 0 bytes .../images/icons/page_white_acrobat.png | Bin 591 -> 0 bytes .../images/icons/page_white_zip.png | Bin 386 -> 0 bytes themes/ssorgsites/images/icons/page_word.png | Bin 777 -> 0 bytes themes/ssorgsites/images/info_button.png | Bin 3713 -> 0 bytes themes/ssorgsites/images/lightbulb.png | Bin 1181 -> 0 bytes themes/ssorgsites/images/logo.png | Bin 4029 -> 0 bytes themes/ssorgsites/images/note.gif | Bin 1541 -> 0 bytes themes/ssorgsites/images/notification.png | Bin 3678 -> 0 bytes themes/ssorgsites/images/quote.gif | Bin 255 -> 0 bytes themes/ssorgsites/images/search.png | Bin 1014 -> 0 bytes themes/ssorgsites/images/toolbar/bar-bg.gif | Bin 446 -> 0 bytes themes/ssorgsites/images/toolbar/bar-logo.gif | Bin 2344 -> 0 bytes themes/ssorgsites/images/toolbar/logo.jpg | Bin 3751 -> 0 bytes themes/ssorgsites/images/toolbar/menu-lft.gif | Bin 603 -> 0 bytes themes/ssorgsites/images/toolbar/menu-rht.gif | Bin 1020 -> 0 bytes .../ssorgsites/images/toolbar/search-lft.gif | Bin 727 -> 0 bytes .../ssorgsites/images/toolbar/search-rht.gif | Bin 472 -> 0 bytes themes/ssorgsites/images/warning.png | Bin 4270 -> 0 bytes 35 files changed, 43 insertions(+), 955 deletions(-) delete mode 100644 themes/ssorgsites/README.md delete mode 100755 themes/ssorgsites/css/core.css delete mode 100755 themes/ssorgsites/css/form.css delete mode 100644 themes/ssorgsites/css/grid.css delete mode 100644 themes/ssorgsites/css/print.css delete mode 100644 themes/ssorgsites/css/ss.print.min.css delete mode 100644 themes/ssorgsites/css/ss.screen.min.css delete mode 100755 themes/ssorgsites/css/typography.css delete mode 100644 themes/ssorgsites/images/bullet.gif delete mode 100644 themes/ssorgsites/images/error_button.png delete mode 100644 themes/ssorgsites/images/external_link.png delete mode 100644 themes/ssorgsites/images/ico_close_off.png delete mode 100644 themes/ssorgsites/images/icons/application.png delete mode 100644 themes/ssorgsites/images/icons/page_excel.png delete mode 100644 themes/ssorgsites/images/icons/page_white_acrobat.png delete mode 100644 themes/ssorgsites/images/icons/page_white_zip.png delete mode 100644 themes/ssorgsites/images/icons/page_word.png delete mode 100644 themes/ssorgsites/images/info_button.png delete mode 100644 themes/ssorgsites/images/lightbulb.png delete mode 100644 themes/ssorgsites/images/logo.png delete mode 100644 themes/ssorgsites/images/note.gif delete mode 100644 themes/ssorgsites/images/notification.png delete mode 100644 themes/ssorgsites/images/quote.gif delete mode 100644 themes/ssorgsites/images/search.png delete mode 100755 themes/ssorgsites/images/toolbar/bar-bg.gif delete mode 100755 themes/ssorgsites/images/toolbar/bar-logo.gif delete mode 100755 themes/ssorgsites/images/toolbar/logo.jpg delete mode 100755 themes/ssorgsites/images/toolbar/menu-lft.gif delete mode 100755 themes/ssorgsites/images/toolbar/menu-rht.gif delete mode 100755 themes/ssorgsites/images/toolbar/search-lft.gif delete mode 100755 themes/ssorgsites/images/toolbar/search-rht.gif delete mode 100644 themes/ssorgsites/images/warning.png diff --git a/app/code/ControllerExtension.php b/app/code/ControllerExtension.php index c08ea4e..f16a1c7 100644 --- a/app/code/ControllerExtension.php +++ b/app/code/ControllerExtension.php @@ -2,32 +2,22 @@ class ControllerExtension extends Extension { - static $google_analytics_code = null; - - public function onBeforeInit() { - - Requirements::combine_files('doc.css', array( - 'themes/ssorgsites/css/core.css', - 'themes/ssorgsites/css/grid.css', - 'themes/ssorgsites/css/typography.css', - 'themes/ssorgsites/css/form.css', - 'docsviewer/css/DocumentationViewer.css' - )); - - Requirements::css('themes/ssorgsites/css/print.css', 'print'); - } - /** - * @return String + * @var string */ - function getGoogleAnalyticsCode() { + public static $google_analytics_code = null; + + /** + * @return string + */ + public function getGoogleAnalyticsCode() { return self::$google_analytics_code; } /** - * @return Bool + * @return boolean */ - function IsDev() { + public function IsDev() { return (Director::isDev()); } } \ No newline at end of file diff --git a/themes/docs/templates/DocumentationViewer.ss b/themes/docs/templates/DocumentationViewer.ss index dfd0549..c3b2af8 100644 --- a/themes/docs/templates/DocumentationViewer.ss +++ b/themes/docs/templates/DocumentationViewer.ss @@ -6,12 +6,6 @@ <% if PageTitle %>$PageTitle <% end_if %>SilverStripe Documentation - - - - - - @@ -26,38 +20,36 @@
-