Permalink
Browse files

extracted more twb specific items into the twb template

  • Loading branch information...
1 parent 5cf93fb commit 4c1d43d87aca17ebcb1d6d292d724efc5887fbff @jbasdf committed Mar 7, 2009
Showing with 141 additions and 171 deletions.
  1. +1 −1 app/helpers/theme_helper.rb
  2. +2 −3 app/views/layouts/global/_head.html.erb
  3. +1 −1 lib/generators/theme/theme_generator.rb
  4. BIN public/images/bg.jpg
  5. BIN public/images/{ → twb}/TeachersLeadersHead.gif
  6. BIN public/images/{ → twb}/backtest2a.jpg
  7. BIN public/images/{ → twb}/backtest2c.gif
  8. BIN public/images/{ → twb}/button.gif
  9. BIN public/images/twb/button_donate.png
  10. BIN public/images/twb/button_participate.png
  11. BIN public/images/{ → twb}/button_register.gif
  12. BIN public/images/{ → twb}/button_search.gif
  13. BIN public/images/{ → twb}/button_signin.gif
  14. BIN public/images/{ → twb}/button_submit.gif
  15. BIN public/images/{ → twb}/button_whatb.png
  16. BIN public/images/{ → twb}/carta-line.gif
  17. BIN public/images/{ → twb}/donate_bg.png
  18. BIN public/images/{ → twb}/facebook_icon.gif
  19. BIN public/images/{ → twb}/featured_members.gif
  20. BIN public/images/{ → twb}/fredjane.jpg
  21. BIN public/images/{ → twb}/h6_blue_trans.png
  22. BIN public/images/{ → twb}/home-logo.jpg
  23. BIN public/images/{ → twb}/home-logo.png
  24. BIN public/images/{ → twb}/icon_conference.gif
  25. BIN public/images/{ → twb}/icon_courses.gif
  26. BIN public/images/{ → twb}/icon_donate.gif
  27. BIN public/images/{ → twb}/icon_help.gif
  28. BIN public/images/{ → twb}/icon_help_out.gif
  29. BIN public/images/{ → twb}/icon_network.gif
  30. BIN public/images/{ → twb}/icon_news.gif
  31. BIN public/images/{ → twb}/icon_where.gif
  32. BIN public/images/{ → twb}/inner-top.jpg
  33. BIN public/images/{ → twb}/landscape_whiteb.gif
  34. BIN public/images/{ → twb}/linkedin_icon.gif
  35. BIN public/images/{ → twb}/mainb.gif
  36. BIN public/images/{ → twb}/man.png
  37. BIN public/images/{ → twb}/map.png
  38. BIN public/images/{ → twb}/mid-spacing.gif
  39. BIN public/images/{ → twb}/mid_white_spacing.gif
  40. BIN public/images/{ → twb}/midsect_darkb.gif
  41. BIN public/images/{ → twb}/midsect_light.gif
  42. BIN public/images/{ → twb}/nav_dropdown_bottom.png
  43. BIN public/images/{ → twb}/nav_dropdown_grad.png
  44. BIN public/images/{ → twb}/nav_dropdown_hover.gif
  45. BIN public/images/{ → twb}/nav_dropdown_li.png
  46. BIN public/images/{ → twb}/nav_dropdown_sep.gif
  47. BIN public/images/{ → twb}/nav_separator.png
  48. BIN public/images/{ → twb}/parchment-background.jpg
  49. BIN public/images/{ → twb}/parchment-background2.gif
  50. BIN public/images/{ → twb}/parchment-background2.jpg
  51. BIN public/images/{ → twb}/parchment-background2.png
  52. BIN public/images/{ → twb}/participate.png
  53. BIN public/images/{ → twb}/raphael2.jpg
  54. BIN public/images/{ → twb}/registration.jpg
  55. BIN public/images/{ → twb}/rounded_field.gif
  56. BIN public/images/{ → twb}/search_bg.png
  57. BIN public/images/{ → twb}/search_bgb.png
  58. BIN public/images/{ → twb}/signin_bg.png
  59. BIN public/images/{ → twb}/splash.jpg
  60. BIN public/images/{ → twb}/splash1280.jpg
  61. BIN public/images/{ → twb}/splash1440.jpg
  62. BIN public/images/{ → twb}/splash800.jpg
  63. BIN public/images/{ → twb}/tagback.png
  64. BIN public/images/{ → twb}/top.gif
  65. BIN public/images/{ → twb}/twb-logo-home-2009.gif
  66. BIN public/images/{ → twb}/twb.png
  67. BIN public/images/{ → twb}/twb_members_in_action_head.gif
  68. BIN public/images/{ → twb}/twbguy_2.gif
  69. BIN public/images/{ → twb}/twitter_icon.gif
  70. BIN public/images/{ → twb}/youtube_icon.gif
  71. +0 −54 public/stylesheets/scaffold.css
  72. 0 public/stylesheets/themes/default/{default.css → styles.css}
  73. +39 −39 public/stylesheets/{ → themes/twb}/print.css
  74. +9 −9 public/stylesheets/{ → themes/twb}/splash1024.css
  75. +9 −9 public/stylesheets/{ → themes/twb}/splash1280.css
  76. +9 −9 public/stylesheets/{ → themes/twb}/splash1440.css
  77. +9 −9 public/stylesheets/{ → themes/twb}/splash800.css
  78. +28 −28 public/stylesheets/themes/twb/{twb.css → styles.css}
  79. +6 −6 themes/twb/views/home/home.html.erb
  80. +25 −0 themes/twb/views/layouts/global/_head.html.erb
  81. +3 −3 themes/twb/views/layouts/home.html.erb
@@ -1,7 +1,7 @@
module ThemeHelper
def theme_stylesheet_link_tag
- stylesheet_link_tag "themes/#{current_theme}"
+ stylesheet_link_tag "themes/#{current_theme}/styles"
end
end
@@ -1,9 +1,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="description" content="Teachers Without Borders supports teacher-leaders, worldwide, because they play a vital role in their communities." />
<title><%= @title || _(GlobalConfig.application_name) -%></title>
-<%= stylesheet_link_tag 'reset', 'ie', 'application', 'beast', 'standard', :cache=>true -%>
-<%= stylesheet_link_tag "print", :media => "print" %>
-<%= javascript_include_tag 'jquery', 'jquery-ui', 'jrails', 'thickbox', 'jquery.blockUI.js', 'jquery-plugins/jquery.jgrowl_minimized.js', 'application' -%>
+<%= stylesheet_link_tag 'reset', 'ie', 'application', 'beast', 'standard', :cache=>true -%>
+<%= javascript_include_tag 'jquery', 'jquery-ui', 'jrails', 'thickbox', 'jquery-plugins/jquery.jgrowl_minimized.js', 'application' -%>
<%= theme_stylesheet_link_tag %>
<%= javascript_tag %[const AUTH_TOKEN = #{form_authenticity_token.inspect};] if protect_against_forgery? -%>
<%= yield :head -%>
@@ -17,7 +17,7 @@ def manifest
#stylesheets
m.directory "public/stylesheets/themes"
m.directory "public/stylesheets/themes/#{file_name}"
- m.file "stylesheets/styles.css", "public/stylesheets/themes/#{file_name}/#{file_name}.css"
+ m.file "stylesheets/styles.css", "public/stylesheets/themes/#{file_name}/styles.css"
# localization
m.file "locale/en.yml", "themes/#{file_name}/locale/en.yml"
View
Deleted file not rendered
File renamed without changes
File renamed without changes
File renamed without changes
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -1,54 +0,0 @@
-body { background-color: #fff; color: #333; }
-
-body, p, ol, ul, td {
- font-family: verdana, arial, helvetica, sans-serif;
- font-size: 13px;
- line-height: 18px;
-}
-
-pre {
- background-color: #eee;
- padding: 10px;
- font-size: 11px;
-}
-
-a { color: #000; }
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
-.fieldWithErrors {
- padding: 2px;
- background-color: red;
- display: table;
-}
-
-#errorExplanation {
- width: 400px;
- border: 2px solid red;
- padding: 7px;
- padding-bottom: 12px;
- margin-bottom: 20px;
- background-color: #f0f0f0;
-}
-
-#errorExplanation h2 {
- text-align: left;
- font-weight: bold;
- padding: 5px 5px 5px 15px;
- font-size: 12px;
- margin: -7px;
- background-color: #c00;
- color: #fff;
-}
-
-#errorExplanation p {
- color: #333;
- margin-bottom: 0;
- padding: 5px;
-}
-
-#errorExplanation ul li {
- font-size: 12px;
- list-style: square;
-}
-
@@ -1,39 +1,39 @@
-body {
- background: white;
- font-size: 12pt;
-}
-
-a:link, a:visited {
- color: #520;
- background: transparent;
- font-weight: bold;
- text-decoration: underline;
-}
-
- a:link:after, #content a:visited:after {
- content: " (" attr(href) ") ";
- font-size: 90%;
-}
-
-a[href^="/"]:after {
- content: " (http://www.teacherswithoutborders.org" attr(href) ") ";
-}
-
-#header,
-#landscape,
-#nav,
-#subnav,
-#footer dl {
- display: none;
-}
-
-.content {
- width: auto;
- margin: 0 5%;
- padding: 0;
- border: 0;
- float: none !important;
- color: black;
- background: transparent;
-
-}
+body {
+ background: white;
+ font-size: 12pt;
+}
+
+a:link, a:visited {
+ color: #520;
+ background: transparent;
+ font-weight: bold;
+ text-decoration: underline;
+}
+
+ a:link:after, #content a:visited:after {
+ content: " (" attr(href) ") ";
+ font-size: 90%;
+}
+
+a[href^="/"]:after {
+ content: " (http://www.teacherswithoutborders.org" attr(href) ") ";
+}
+
+#header,
+#landscape,
+#nav,
+#subnav,
+#footer dl {
+ display: none;
+}
+
+.content {
+ width: auto;
+ margin: 0 5%;
+ padding: 0;
+ border: 0;
+ float: none !important;
+ color: black;
+ background: transparent;
+
+}
@@ -1,9 +1,9 @@
-#splash{margin:10px auto; width:994px; height:621px; background-image:url(../images/splash.jpg)}
-#btn1 {height:65px;left:290px;position:relative;top:183px;width:355px;}
-#btn1:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn2 {float:left;height:130px;left:32px;position:relative;top:185px;width:270px;}
-#btn2:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn3 {float:left;height:125px;left:58px;position:relative;top:190px;width:270px;}
-#btn3:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn4 {float:left;height:130px;left:86px;position:relative;top:185px;width:270px;}
-#btn4:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#splash{margin:10px auto; width:994px; height:621px; background-image:url(../images/splash.jpg)}
+#btn1 {height:65px;left:290px;position:relative;top:183px;width:355px;}
+#btn1:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn2 {float:left;height:130px;left:32px;position:relative;top:185px;width:270px;}
+#btn2:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn3 {float:left;height:125px;left:58px;position:relative;top:190px;width:270px;}
+#btn3:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn4 {float:left;height:130px;left:86px;position:relative;top:185px;width:270px;}
+#btn4:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
@@ -1,9 +1,9 @@
-#splash{margin:10px auto; width:1250px; height:781px; background-image:url(../images/splash1280.jpg)}
-#btn1 {height:81px;left:365px;position:relative;top:230px;width:440px;position:relative;}
-#btn1:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn2 {float:left;height:160px;left:45px;position:relative;top:237px;width:330px;}
-#btn2:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn3 {float:left;height:155px;position:relative;top:240px;width:330px;left:90px;}
-#btn3:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn4 {float:left;height:160px;position:relative;top:237px;width:330px;left:133px;}
-#btn4:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#splash{margin:10px auto; width:1250px; height:781px; background-image:url(../images/splash1280.jpg)}
+#btn1 {height:81px;left:365px;position:relative;top:230px;width:440px;position:relative;}
+#btn1:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn2 {float:left;height:160px;left:45px;position:relative;top:237px;width:330px;}
+#btn2:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn3 {float:left;height:155px;position:relative;top:240px;width:330px;left:90px;}
+#btn3:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn4 {float:left;height:160px;position:relative;top:237px;width:330px;left:133px;}
+#btn4:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
@@ -1,9 +1,9 @@
-#splash{margin:10px auto; width:1410px; height:881px; background-image:url(../images/splash1440.jpg)}
-#btn1 {left: 418px; top: 260px; height: 93px; width: 489px; position:relative;}
-#btn1:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn2 {float:left; left: 52px; top: 263px; height: 184px; width: 369px; position:relative;}
-#btn2:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn3 {float:left; left: 105px; top: 271px; height: 176px; width: 369px; position:relative;}
-#btn3:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn4 {float:left; left: 160px; top: 263px; height: 184px; width: 369px; position:relative;}
-#btn4:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#splash{margin:10px auto; width:1410px; height:881px; background-image:url(../images/splash1440.jpg)}
+#btn1 {left: 418px; top: 260px; height: 93px; width: 489px; position:relative;}
+#btn1:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn2 {float:left; left: 52px; top: 263px; height: 184px; width: 369px; position:relative;}
+#btn2:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn3 {float:left; left: 105px; top: 271px; height: 176px; width: 369px; position:relative;}
+#btn3:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn4 {float:left; left: 160px; top: 263px; height: 184px; width: 369px; position:relative;}
+#btn4:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
@@ -1,9 +1,9 @@
-#splash{margin:10px auto; width:770px; height:481px; background-image:url(../images/splash800.jpg)}
-#btn1 {height:48px;left:220px;position:relative;top:143px;width:280px;}
-#btn1:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn2 {float:left;height:102px;left:27px;position:relative;top:144px;width:204px;}
-#btn2:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn3 {float:left;height:95px;left:52px;position:relative;top:150px;width:204px;}
-#btn3:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
-#btn4 {float:left;height:102px;left:78px;position:relative;top:144px;width:204px;}
-#btn4:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#splash{margin:10px auto; width:770px; height:481px; background-image:url(../images/splash800.jpg)}
+#btn1 {height:48px;left:220px;position:relative;top:143px;width:280px;}
+#btn1:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn2 {float:left;height:102px;left:27px;position:relative;top:144px;width:204px;}
+#btn2:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn3 {float:left;height:95px;left:52px;position:relative;top:150px;width:204px;}
+#btn3:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
+#btn4 {float:left;height:102px;left:78px;position:relative;top:144px;width:204px;}
+#btn4:hover{border:solid 2px #FFF; background-color:#BBB; opacity:0.1; filter: alpha (opacity=10);}
Oops, something went wrong.

0 comments on commit 4c1d43d

Please sign in to comment.