diff options
| author | jrags <> | 2007-02-21 15:07:27 +0000 |
|---|---|---|
| committer | jrags <> | 2007-02-21 15:07:27 +0000 |
| commit | 3fcc5ab5ef1c739b65ff1351b5ff2ee1b5cc488d (patch) | |
| tree | 1d1e71044614d9ff4aedbd526758b7a2fb82c291 | |
| parent | 2740cd587446ed5ae72b8550762f2a827aec2390 (diff) | |
Moving from App_Themes to themes
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | demos/activeblog/App_Themes/Default/style.css | 18 | ||||
| -rw-r--r-- | demos/activeblog/protected/App_Layouts/MainLayout.tpl | 29 | ||||
| -rw-r--r-- | demos/activeblog/protected/application.xml | 8 |
4 files changed, 38 insertions, 18 deletions
diff --git a/.gitattributes b/.gitattributes index e5eb7b29..6794012b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -643,6 +643,7 @@ buildscripts/wikibuilder/dumpHTML.inc -text buildscripts/wikibuilder/dumpHTML.php -text buildscripts/wikibuilder/external.png -text buildscripts/wikibuilder/main.css -text +demos/activeblog/App_Themes/Default/style.css -text demos/activeblog/index.php -text demos/activeblog/protected/.htaccess -text demos/activeblog/protected/App_Layouts/MainLayout.php -text diff --git a/demos/activeblog/App_Themes/Default/style.css b/demos/activeblog/App_Themes/Default/style.css new file mode 100644 index 00000000..be98cb9a --- /dev/null +++ b/demos/activeblog/App_Themes/Default/style.css @@ -0,0 +1,18 @@ +html,body{margin:0;padding:0} +body{font: 76% arial,sans-serif;text-align:center} +p{margin:0 10px 10px} +a{display:block;color: #981793;padding:10px} +div.header h1{height:80px;line-height:80px;margin:0; + padding-left:10px;background: #EEE;color: #79B30B} +div.container{text-align:left} +div.content p{line-height:1.4} +div.navigation{background:#B9CAFF} +div.extra{background:#FF8539} +div.footer{background: #333;color: #FFF} +div.footer p{margin:0;padding:5px 10px} + +div.container{width:700px;margin:0 auto} +div.content{float:left;width:500px} +div.navigation{float:right;width:200px} +div.extra{float:right;clear:right;width:200px} +div.footer{clear:both;width:100%}
\ No newline at end of file diff --git a/demos/activeblog/protected/App_Layouts/MainLayout.tpl b/demos/activeblog/protected/App_Layouts/MainLayout.tpl index 2cabbfed..63fa576d 100644 --- a/demos/activeblog/protected/App_Layouts/MainLayout.tpl +++ b/demos/activeblog/protected/App_Layouts/MainLayout.tpl @@ -2,22 +2,27 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
<com:THead Title=<%$ SiteName %> >
-<meta http-equiv="Expires" content="Fri, Jan 01 1900 00:00:00 GMT"/>
-<meta http-equiv="Pragma" content="no-cache"/>
-<meta http-equiv="Cache-Control" content="no-cache"/>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<meta http-equiv="content-language" content="en"/>
</com:THead>
<body>
<com:TForm>
-
-<com:TContentPlaceHolder ID="Main" />
-
-<div id="footer">
-Copyright © <%= date('Y') %> <%$ SiteOwner %>.<br/>
-<%= Prado::poweredByPrado() %>
-
+<div class="container">
+ <div class="header"><h1>Header</h1></div>
+ <div class="wrapper">
+ <div class="content">
+ <com:TContentPlaceHolder ID="Main" />
+ </div>
+ </div>
+ <div class="navigation">
+ <p><strong>2) Navigation here.</strong> long long fill filler very fill column column silly filler very filler fill fill filler text fill very silly fill text filler silly silly filler fill very make fill column text column very very column fill fill very silly column silly silly fill fill long filler </p>
+ </div>
+ <div class="extra">
+ <p><strong>3) More stuff here.</strong> very text make long column make filler fill make column column silly filler text silly column fill silly fill column text filler make text silly filler make filler very silly make text very very text make long filler very make column make silly column fill silly column long make silly filler column filler silly long long column fill silly column very </p>
+ </div>
+ <div class="footer">
+ <p>Copyright © <%= date('Y') %> <%$ SiteOwner %>.<br/><%= Prado::poweredByPrado() %></p>
+ </div>
+</div>
</com:TForm>
</body>
</html>
\ No newline at end of file diff --git a/demos/activeblog/protected/application.xml b/demos/activeblog/protected/application.xml index 06481acc..7b038a2e 100644 --- a/demos/activeblog/protected/application.xml +++ b/demos/activeblog/protected/application.xml @@ -89,14 +89,10 @@ </module> <!-- Theme manager module --> - <module - id="themes" - class="System.Web.UI.TThemeManager" - BasePath="WebRoot.App_Themes" - BaseUrl="/App_Themes" /> + <module id="themes" class="System.Web.UI.TThemeManager" /> </modules> - <pages MasterClass="Application.App_Layouts.MainLayout" /> + <pages MasterClass="Application.App_Layouts.MainLayout" Theme="Default" /> </service> </services> </application>
\ No newline at end of file |