Skip to content
This repository
Browse code

Include in basic Controller view

  • Loading branch information...
commit 3fc928a861d0cc89ec1759dba17480b21d5f50eb 1 parent a5d9e32
Will Rossiter authored September 19, 2012
17  css/debug.css
... ...
@@ -1,6 +1,6 @@
1 1
 body { background-color: #eee; margin: 0; overflow-x: hidden; padding: 0; font-family: Helvetica,Arial,sans-serif; }
2 2
 
3  
-.info { margin: 0 0 6px 0; padding: 18px; background-color: #003050; position: relative; line-height: 24px; color: #fff; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #002137), color-stop(10%, #003050), color-stop(90%, #003050), color-stop(100%, #002137)); background-image: -webkit-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: -moz-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: -o-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: -ms-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: linear-gradient(#002137, #003050 10%, #003050 90%, #002137); }
  3
+.info { margin: 0 0 6px 0; padding: 18px; background-color: #003050; position: relative; line-height: 24px; color: #fff; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #002137), color-stop(10%, #003050), color-stop(90%, #003050), color-stop(100%, #002137)); background-image: -webkit-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: -moz-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: -o-linear-gradient(#002137, #003050 10%, #003050 90%, #002137); background-image: linear-gradient(#002137, #003050 10%, #003050 90%, #002137); }
4 4
 .info h1 { margin: 0 0 6px 0; padding: 0 32px 0 0; color: #fff; font-size: 24px; text-shadow: 0 1px #002137; line-height: 30px; background: url(../admin/images/logo_small.png) no-repeat right 3px; }
5 5
 .info h3 { color: #7da4be; font-size: 16px; line-height: 18px; font-weight: normal; }
6 6
 .info p { margin: 0; font-size: 14px; color: #fff; }
@@ -10,10 +10,7 @@ body { background-color: #eee; margin: 0; overflow-x: hidden; padding: 0; font-f
10 10
 .header { margin: 0; border-bottom: 6px solid #ccdef3; height: 23px; background-color: #666673; padding: 4px 0 2px 6px; }
11 11
 
12 12
 .trace, .build, .options { padding: 6px 12px; }
13  
-.trace .test-case { font-size: 1.1em; }
14 13
 .trace li, .build li, .options li { font-size: 14px; margin: 6px 0; }
15  
-.trace .failure { margin: 1em 0 2em; }
16  
-.trace .failure pre { color: #C80700; background: #FFE9E9; border-color: #FDC4C1; }
17 14
 
18 15
 a { color: #666; }
19 16
 a:hover { color: #222; }
@@ -21,7 +18,7 @@ a:active { color: #111; }
21 18
 
22 19
 p { margin-bottom: 6px; }
23 20
 
24  
-pre { margin: 1em 0; background-color: #f5f5f5; border: 1px solid #eee; border: 1px solid rgba(0, 0, 0, 0.1); color: #333; padding: 10px 15px; overflow: auto; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); }
  21
+pre { margin-bottom: 20px; background-color: #f5f5f5; border: 1px solid #eee; border: 1px solid rgba(0, 0, 0, 0.08); color: #333; padding: 11px; overflow: auto; -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); }
25 22
 pre span { color: #999; }
26 23
 pre .error { color: #f00; }
27 24
 
@@ -31,12 +28,8 @@ h3 { margin: 0 0 6px 0; color: #333; font-size: 18px; line-height: 24px; }
31 28
 
32 29
 ul { margin: 0 0 18px 0; padding: 0 0 0 18px; }
33 30
 
34  
-.status { margin-top: 18px; padding: 0; color: #333; background: #EEEEEE; border: 1px solid #CCCCCC; border-radius: 4px; }
35  
-.status h2 { margin: 10px 15px; }
36  
-.pass { color: #006600; background: #E2F9E3; border-color: #92f192; }
37  
-.fail { color: #C80700; background: #FFE9E9; border-color: #FDC4C1; }
  31
+fieldset { border: 1px solid #b2b2b2; margin-bottom: 18px; padding: 17px; }
38 32
 
39  
-.message { background-color: white; color: #333; margin: 0.5em; padding: 0.5em 0.8em 0.4em; border: 1px #CCC solid; border-radius: 4px; }
40  
-.message.warning { color: #fc7330; background: #fcf5ed; border-color: #fdd0a0; }
  33
+.pass { margin-top: 18px; padding: 2px 20px 2px 40px; color: #006600; background: #E2F9E3; border: 1px solid #8DD38D; border-radius: 4px; }
41 34
 
42  
-.total-time { padding: 0 15px; margin-bottom: 1em; }
  35
+.fail { margin-top: 18px; padding: 2px 20px 2px 40px; color: #C80700; background: #FFE9E9; border: 1px solid #C80700; border-radius: 4px; }
6  scss/debug.scss
@@ -129,6 +129,12 @@ ul {
129 129
 	padding: 0 0 0 18px;
130 130
 }
131 131
 
  132
+fieldset {
  133
+	border: 1px solid #b2b2b2;
  134
+	margin-bottom: 18px;
  135
+	padding: 17px;
  136
+}
  137
+
132 138
 .pass { 
133 139
 	margin-top:18px; padding:2px 20px 2px 40px; color:#006600; background:#E2F9E3; border: 1px solid #8DD38D; 
134 140
 	border-radius:4px; 
48  templates/Controller.ss
@@ -11,33 +11,35 @@
11 11
 	<body>
12 12
 		<div class="info">
13 13
 			<h1><% if $Title %>$Title<% else %>Welcome to SilverStripe<% end_if %></h1>
14  
-			<h3>Generated with the default Controller.ss template</h3>
15 14
 		</div>
16 15
 
17 16
 		<div class="options">
18  
-			<% if $Content %>$Content<% else %>
19  
-			<h3>Getting Started</h3>
20  
-
21  
-			<p>To get started with the SilverStripe framework:</p>
22  
-			<ol>
23  
-				<li>Create a <code>Controller</code> subclass (<a href="http://doc.silverstripe.org/framework/en/topics/controller">doc.silverstripe.org/framework/en/topics/controller</a>)</li>
24  
-				<li>Setup the routes.yml f to your <code>Controller</code> (<a href="http://doc.silverstripe.org/framework/en/reference/director#routing">doc.silverstripe.org/framework/en/reference/director#routing</a>).</li>
25  
-				<li>Create a template for your <code>Controller</code> (<a href="http://doc.silverstripe.org/framework/en/reference/templates">doc.silverstripe.org/framework/en/reference/templates</a>)</li>
26  
-			</ol>
  17
+			<% if $Content || $Form %>
  18
+				$Content
  19
+				$Form
  20
+			<% else %>
  21
+				<h3>Getting Started</h3>
  22
+
  23
+				<p>To get started with the SilverStripe framework:</p>
  24
+				<ol>
  25
+					<li>Create a <code>Controller</code> subclass (<a href="http://doc.silverstripe.org/framework/en/topics/controller">doc.silverstripe.org/framework/en/topics/controller</a>)</li>
  26
+					<li>Setup the routes.yml f to your <code>Controller</code> (<a href="http://doc.silverstripe.org/framework/en/reference/director#routing">doc.silverstripe.org/framework/en/reference/director#routing</a>).</li>
  27
+					<li>Create a template for your <code>Controller</code> (<a href="http://doc.silverstripe.org/framework/en/reference/templates">doc.silverstripe.org/framework/en/reference/templates</a>)</li>
  28
+				</ol>
  29
+
  30
+				<h3>Community resources</h3>
  31
+
  32
+				<ul>
  33
+					<li>
  34
+						<p><a href="http://silverstripe.org/forum">silverstripe.org/forum</a> Discussion forums for the development community.</p>
  35
+					</li>
  36
+					<li><p><a href="http://silverstripe.org/irc">silverstripe.org/irc</a> IRC channel for realtime support and discussions.</p></li>
  37
+
  38
+					<li><p><a href="http://doc.silverstripe.org">doc.silverstripe.org</a> Searchable developer documentation, how-tos, tutorials, and reference.</p></li>
  39
+
  40
+					<li><p><a href="http://api.silverstripe.org">api.silverstripe.org</a> API documentation for PHP classes, methods and properties.</p></li>
  41
+				<ul>
27 42
 			<% end_if %>
28  
-
29  
-			<h3>Community resources</h3>
30  
-
31  
-			<ul>
32  
-				<li>
33  
-					<p><a href="http://silverstripe.org/forum">silverstripe.org/forum</a> Discussion forums for the development community.</p>
34  
-				</li>
35  
-				<li><p><a href="http://silverstripe.org/irc">silverstripe.org/irc</a> IRC channel for realtime support and discussions.</p></li>
36  
-
37  
-				<li><p><a href="http://doc.silverstripe.org">doc.silverstripe.org</a> Searchable developer documentation, how-tos, tutorials, and reference.</p></li>
38  
-
39  
-				<li><p><a href="http://api.silverstripe.org">api.silverstripe.org</a> API documentation for PHP classes, methods and properties.</p></li>
40  
-			<ul>
41 43
 		</div>
42 44
 	</body>
43 45
 </html>

0 notes on commit 3fc928a

Please sign in to comment.
Something went wrong with that request. Please try again.