Permalink
Browse files

FIX: remove ssorgtheme, use all styles from docviewer

  • Loading branch information...
wilr authored and sminnee committed Nov 9, 2012
1 parent eeb14bf commit 4a61a47719c1347844d0b4e84842d9551aa1f649
Showing with 42 additions and 954 deletions.
  1. +8 −18 app/code/ControllerExtension.php
  2. +25 −33 themes/docs/templates/DocumentationViewer.ss
  3. +9 −5 themes/docs/templates/Layout/DocumentationViewer.ss
  4. +0 −21 themes/ssorgsites/README.md
  5. +0 −436 themes/ssorgsites/css/core.css
  6. +0 −3 themes/ssorgsites/css/form.css
  7. +0 −30 themes/ssorgsites/css/grid.css
  8. +0 −9 themes/ssorgsites/css/print.css
  9. +0 −1 themes/ssorgsites/css/ss.print.min.css
  10. +0 −200 themes/ssorgsites/css/ss.screen.min.css
  11. +0 −198 themes/ssorgsites/css/typography.css
  12. BIN themes/ssorgsites/images/bullet.gif
  13. BIN themes/ssorgsites/images/error_button.png
  14. BIN themes/ssorgsites/images/external_link.png
  15. BIN themes/ssorgsites/images/ico_close_off.png
  16. BIN themes/ssorgsites/images/icons/application.png
  17. BIN themes/ssorgsites/images/icons/page_excel.png
  18. BIN themes/ssorgsites/images/icons/page_white_acrobat.png
  19. BIN themes/ssorgsites/images/icons/page_white_zip.png
  20. BIN themes/ssorgsites/images/icons/page_word.png
  21. BIN themes/ssorgsites/images/info_button.png
  22. BIN themes/ssorgsites/images/lightbulb.png
  23. BIN themes/ssorgsites/images/logo.png
  24. BIN themes/ssorgsites/images/note.gif
  25. BIN themes/ssorgsites/images/notification.png
  26. BIN themes/ssorgsites/images/quote.gif
  27. BIN themes/ssorgsites/images/search.png
  28. BIN themes/ssorgsites/images/toolbar/bar-bg.gif
  29. BIN themes/ssorgsites/images/toolbar/bar-logo.gif
  30. BIN themes/ssorgsites/images/toolbar/logo.jpg
  31. BIN themes/ssorgsites/images/toolbar/menu-lft.gif
  32. BIN themes/ssorgsites/images/toolbar/menu-rht.gif
  33. BIN themes/ssorgsites/images/toolbar/search-lft.gif
  34. BIN themes/ssorgsites/images/toolbar/search-rht.gif
  35. BIN themes/ssorgsites/images/warning.png
@@ -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'
- ));
+ /**
+ * @var string
+ */
+ public static $google_analytics_code = null;
- Requirements::css('themes/ssorgsites/css/print.css', 'print');
- }
-
/**
- * @return String
+ * @return string
*/
- function getGoogleAnalyticsCode() {
+ public function getGoogleAnalyticsCode() {
return self::$google_analytics_code;
}
/**
- * @return Bool
+ * @return boolean
*/
- function IsDev() {
+ public function IsDev() {
return (Director::isDev());
}
}
@@ -6,12 +6,6 @@
<meta charset="utf-8" />
<title><% if PageTitle %>$PageTitle <% end_if %>SilverStripe Documentation</title>
- <!-- not using requirements to avoid no styles on 404 -->
- <link type="text/css" rel="stylesheet" href="/themes/ssorgsites/css/core.css" />
- <link type="text/css" rel="stylesheet" href="/themes/ssorgsites/css/grid.css" />
- <link type="text/css" rel="stylesheet" href="/themes/ssorgsites/css/form.css" />
- <link type="text/css" rel="stylesheet" href="/docsviewer/css/DocumentationViewer.css" />
-
<link type="text/css" rel="stylesheet" href="http://silverstripe.org/toolbar/css/toolbar.css" />
</head>
@@ -26,38 +20,36 @@
<div id="layout">
- <div id="search-bar">
- <div id="breadcrumbs">
- <% include DocBreadcrumbs %>
- </div>
-
+ <div id="search-bar">
<div id="search">
$DocumentationSearchForm
</div>
+ <div id="top-nav">
- <% if Entities %>
- <div id="entities-nav" class="documentation-nav clearfix">
- <h2>Modules:</h2>
- <ul>
- <% control Entities %>
- <li><a href="$Link" class="$LinkingMode">$Title</a></li>
- <% end_control %>
- </ul>
-
- <div class="clear"><!-- --></div>
- </div>
- <% end_if %>
-
- <% if Versions %>
- <div id="versions-nav" class="documentation-nav clearfix">
- <h2>Versions:</h2>
- <ul>
- <% control Versions %>
- <li><a href="$Link" class="$LinkingMode">$Title</a></li>
- <% end_control %>
- </ul>
+ <% if Entities %>
+ <div id="entities-nav" class="documentation-nav clearfix">
+ <h2>Modules:</h2>
+ <ul>
+ <% control Entities %>
+ <li><a href="$Link" class="$LinkingMode">$Title</a></li>
+ <% end_control %>
+ </ul>
+
+ <div class="clear"><!-- --></div>
+ </div>
+ <% end_if %>
+
+ <% if Versions %>
+ <div id="versions-nav" class="documentation-nav clearfix">
+ <h2>Versions:</h2>
+ <ul>
+ <% control Versions %>
+ <li><a href="$Link" class="$LinkingMode">$Title</a></li>
+ <% end_control %>
+ </ul>
+ </div>
+ <% end_if %>
</div>
- <% end_if %>
</div>
<div id="content" class="typography">
@@ -1,9 +1,14 @@
+<% if VersionWarning %>
+ <% include DocumentationVersion_warning %>
+<% end_if %>
+
<div id="documentation-page">
- <% if VersionWarning %>
- <% include DocumentationVersion_warning %>
- <% end_if %>
-
<div id="content-column">
+ <% if Breadcrumbs %>
+ <% include DocBreadcrumbs %>
+ <% end_if %>
+
+
$Content
<% if EditLink %>
@@ -17,7 +22,6 @@
<% if Content %>
<div id="sidebar-column">
- <% include DocTableOfContents %>
<% include DocInThisModule %>
</div>
<% end_if %>
@@ -1,21 +0,0 @@
-# Introduction
-
-SSorgsites is the base library styles developed for the range of ssorgsites to share.
-
- * open.silverstripe.org
- * api.silverstripe.org
- * docs.silverstripe.org
- * wiki.silverstripe.org
- * userhelp.silverstripe.org
-
-## Usage
-
- * Add this module as an external to themes/ssorgsites.
- * Link to the CSS from the ss template using using
-
- <% require css(themes/ssorgsites/css/ss.screen.min.css, screen) %>
- <% require css(themes/ssorgsites/css/ss.print.min.css, print) %>
-
-## Generating ss.*.min files
-
-This minimal clone of the ssorgsites theme doesn't have the ability to regenerate the minified files.
Oops, something went wrong.

0 comments on commit 4a61a47

Please sign in to comment.