r258@sede: terceiro | 2007-07-29 20:11:48 -0300

ActionItem0: adding parenthesis so Ruby stops complaining git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@262 3f533792-8f58-4932-b0fe-aaf55b0a4547

r258@sede: terceiro | 2007-07-29 20:11:48 -0300
ActionItem0: adding parenthesis so Ruby stops complaining git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@262 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 902034a3
Showing 3 changed files with 317 additions and 297 deletions Show diff stats
app/helpers/application_helper.rb
public/designs/templates/default/stylesheets/1024px.css
vendor/plugins/design/test/design_editor_test.rb
@@ -91,9 +91,9 @@ module ApplicationHelper
   # TODO: test this helper
   def user_links
     links = [
-       [ link_to _('My accont'), { :controller => 'account' } ],
-       [ link_to_profile _('My home page') ],
-       [ link_to_cms _('Manage content') ],
+       [ link_to(_('My accont'), { :controller => 'account' }) ],
+       [ link_to_profile(_('My home page')) ],
+       [ link_to_cms(_('Manage content')) ],
     ].join("\n")
     content_tag('div', links, :id => 'user_links')
   end
-/* 1024px - a free xhtml/css website template by Andreas Viklund - http://andreasviklund.com/ - that may be used for any purpose as long as the proper credits are given to the original designer.
-
-Version: 2.0 (Jan 29, 2007)
-
-Screen layout: */
-
-/*** General tags ***/
-
-body {
-background:url(../images/background.gif) repeat-y top center #fff;
-color:#404040;
-font:76% Verdana,Tahoma,Arial,sans-serif;
-line-height:1.2em;
-margin:0 auto;
-padding:0;
-}
-
-a {
-color:#4088b8;
-font-weight:700;
-text-decoration:none;
-}
-
-a:hover {
-text-decoration:underline;
-}
-
-a img {
-border:0;
-}
-
-p {
-margin:0 0 18px 10px;
-}
-
-ul,ol,dl {
-font-size:0.9em;
-margin:2px 0 16px 35px;
-}
-
-ul ul,ol ol {
-margin:4px 0 4px 35px;
-}
-
-blockquote {
-border:1px solid #dadada;
-font-size:0.9em;
-margin:20px 10px;
-padding:8px;
-}
-
-h1 {
-color:#4088b8;
-font-size:4.2em;
-letter-spacing:-5px;
-margin:0 0 30px 25px;
-}
-
-h1 a {
-color:#4088b8;
-text-transform:none;
-}
-
-h2 {
-border-bottom:4px solid #dadada;
-color:#4088b8;
-font-size:1.4em;
-letter-spacing:-1px;
-margin:0 0 10px;
-padding:0 2px 2px 5px;
-}
-
-h3 {
-border-bottom:1px solid #dadada;
-color:#4088b8;
-font-size:1.2em;
-font-weight:700;
-margin:10px 0 8px;
-padding:1px 2px 2px 3px;
-}
-
-/*** Main wrap and header ***/
-
-#wrap {
-color:#404040;
-margin:10px auto;
-padding:0;
-width:970px;
-}
-
-#header {
-margin:0;
-}
-
-#menu {
-font-size:0.9em;
-padding:5px 2px 2px 3px;
-text-align:right;
-}
-
-#menu a {
-color:gray;
-}
-
-#slogan {
-color:gray;
-font-size:1.5em;
-font-weight:700;
-letter-spacing:-1px;
-line-height:1.2em;
-margin:15px 0 20px 35px;
-}
-
-/*** Sidebar and menu ***/
-
-#box_1 {
-float:left;
-line-height:1.4em;
-padding:1px 0 0;
+/* 1024px - a free xhtml/css website template by Andreas Viklund - http://andreasviklund.com/ - that may be used for any purpose as long as the proper credits are given to the original designer.
+
+Version: 2.0 (Jan 29, 2007)
+
+Screen layout: */
+
+/*** General tags ***/
+
+body {
+background:url(../images/background.gif) repeat-y top center #fff;
+color:#404040;
+font:76% Verdana,Tahoma,Arial,sans-serif;
+line-height:1.2em;
+margin:0 auto;
+padding:0;
+}
+
+a {
+color:#4088b8;
+font-weight:700;
+text-decoration:none;
+}
+
+a:hover {
+text-decoration:underline;
+}
+
+a img {
+border:0;
+}
+
+p {
+margin:0 0 18px 10px;
+}
+
+ul,ol,dl {
+font-size:0.9em;
+margin:2px 0 16px 35px;
+}
+
+ul ul,ol ol {
+margin:4px 0 4px 35px;
+}
+
+blockquote {
+border:1px solid #dadada;
+font-size:0.9em;
+margin:20px 10px;
+padding:8px;
+}
+
+h1 {
+color:#4088b8;
+font-size:4.2em;
+letter-spacing:-5px;
+margin:0 0 30px 25px;
+}
+
+h1 a {
+color:#4088b8;
+text-transform:none;
+}
+
+h2 {
+border-bottom:4px solid #dadada;
+color:#4088b8;
+font-size:1.4em;
+letter-spacing:-1px;
+margin:0 0 10px;
+padding:0 2px 2px 5px;
+}
+
+h3 {
+border-bottom:1px solid #dadada;
+color:#4088b8;
+font-size:1.2em;
+font-weight:700;
+margin:10px 0 8px;
+padding:1px 2px 2px 3px;
+}
+
+/*** Main wrap and header ***/
+
+#wrap {
+color:#404040;
+margin:10px auto;
+padding:0;
+width:970px;
+}
+
+#header {
+border: 1px solid blue;
+padding-left: 5em;
+}
+
+#menu {
+font-size:0.9em;
+padding:5px 2px 2px 3px;
+text-align:right;
+border: 1px solid red;
+float: right;
+}
+
+#menu a {
+color:gray;
+}
+
+#slogan {
+color:gray;
+font-size:1.5em;
+font-weight:700;
+letter-spacing:-1px;
+line-height:1.2em;
+margin:15px 0 20px 35px;
+}
+
+/*** Sidebar and menu ***/
+
+#box_1 {
+float:left;
+line-height:1.4em;
+padding:1px 0 0;
 width:20%;
-}
-
-#box_1 ul {
-font-size:0.9em;
-list-style:none;
-margin:0;
-padding:0 0 15px 10px;
-}
-
-#box_1 li {
-list-style:none;
-margin:0 0 4px;
-padding:0;
-}
-
-#box_1 li a {
-font-size:1.2em;
-font-weight:700;
-padding:2px;
-}
-
-#box_1 ul ul {
-line-height:1.2em;
-margin:4px 0 3px 15px;
-padding:0;
-}
-
-#box_1 ul ul li a {
-font-weight:400;
-}
-
-#box_1 h2 {
-margin:3px 0 8px;
-}
-
-/*** Box 3 ***/
-
-#box_3 {
-float:left;
-line-height:1.4em;
-padding:1px 0 0;
+}
+
+#box_1 ul {
+font-size:0.9em;
+list-style:none;
+margin:0;
+padding:0 0 15px 10px;
+}
+
+#box_1 li {
+list-style:none;
+margin:0 0 4px;
+padding:0;
+}
+
+#box_1 li a {
+font-size:1.2em;
+font-weight:700;
+padding:2px;
+}
+
+#box_1 ul ul {
+line-height:1.2em;
+margin:4px 0 3px 15px;
+padding:0;
+}
+
+#box_1 ul ul li a {
+font-weight:400;
+}
+
+#box_1 h2 {
+margin:3px 0 8px;
+}
+
+/*** Box 3 ***/
+
+#box_3 {
+float:left;
+line-height:1.4em;
+padding:1px 0 0;
 width:20%;
-}
-
-#box_3 ul {
-font-size:0.9em;
-list-style:none;
-margin:0;
-padding:0 0 15px 10px;
-}
-
-#box_3 li {
-list-style:none;
-margin:0 0 4px;
-padding:0;
-}
-
-#box_3 li a {
-font-size:1.2em;
-font-weight:700;
-padding:2px;
-}
-
-#box_3 ul ul {
-line-height:1.2em;
-margin:4px 0 3px 15px;
-padding:0;
-}
-
-#box_3 ul ul li a {
-font-weight:400;
-}
-
-#box_3 h2 {
-margin:3px 0 8px;
-}
-
-
-/*** Main content ***/
-
-
-#box_2 {
-float:left;
-line-height:1.5em;
-margin:0px 20px 0px 20px;
-padding:0;
-text-align:left;
-width: 540px;
-}
-
-#box_2 h3 {
-margin:10px 0 8px;
-}
-
-/*** Footer ***/
-
-#footer {
-border-top:4px solid #dadada;
-clear:both;
-color:gray;
-font-size:0.9em;
-line-height:1.6em;
-margin:0 auto;
-padding:8px 0;
-text-align:right;
-}
-
-#footer p {
-margin:0;
-padding:0;
-}
-
-#footer a {
-color:#808080;
-}
-
-/*** Various classes ***/
-
-.box {
-background:#4088b8;
-border:1px solid #c8c8c8;
-color:#fff;
-font-size:0.9em;
-line-height:1.4em;
-padding:10px 10px 10px 13px;
-}
-
-.box a {
-color:#f0f0f0;
-}
-
-.left {
-float:left;
-margin:0 15px 4px 0;
-}
-
-.right {
-float:right;
-margin:0 0 4px 15px;
-}
-
-.readmore {
-margin:-10px 10px 12px 0;
-text-align:right;
-}
-
-.timestamp {
-font-size:1.2em;
-margin:-5px 0 15px 10px;
-}
-
-.timestamp a {
-font-weight:normal;
-}
-
-.blue {
-color:#4088b8;
-}
-
-.clear {
-clear:both;
-}
-
-.fade {
-color:#c8c8c8;
-}
-
-.gray {
-color:gray;
-}
-
-.photo {
-background:#fff;
-border:1px solid #bababa;
-margin:6px 18px 2px 5px;
-padding:2px;
+}
+
+#box_3 ul {
+font-size:0.9em;
+list-style:none;
+margin:0;
+padding:0 0 15px 10px;
+}
+
+#box_3 li {
+list-style:none;
+margin:0 0 4px;
+padding:0;
+}
+
+#box_3 li a {
+font-size:1.2em;
+font-weight:700;
+padding:2px;
+}
+
+#box_3 ul ul {
+line-height:1.2em;
+margin:4px 0 3px 15px;
+padding:0;
+}
+
+#box_3 ul ul li a {
+font-weight:400;
+}
+
+#box_3 h2 {
+margin:3px 0 8px;
+}
+
+
+/*** Main content ***/
+
+
+#box_2 {
+float:left;
+line-height:1.5em;
+margin:0px 20px 0px 20px;
+padding:0;
+text-align:left;
+width: 540px;
+}
+
+#box_2 h3 {
+margin:10px 0 8px;
+}
+
+/*** Footer ***/
+
+#footer {
+border-top:4px solid #dadada;
+clear:both;
+color:gray;
+font-size:0.9em;
+line-height:1.6em;
+margin:0 auto;
+padding:8px 0;
+text-align:right;
+}
+
+#footer p {
+margin:0;
+padding:0;
+}
+
+#footer a {
+color:#808080;
+}
+
+/*** Various classes ***/
+
+.box {
+background:#4088b8;
+border:1px solid #c8c8c8;
+color:#fff;
+font-size:0.9em;
+line-height:1.4em;
+padding:10px 10px 10px 13px;
+}
+
+.box a {
+color:#f0f0f0;
+}
+
+.left {
+float:left;
+margin:0 15px 4px 0;
+}
+
+.right {
+float:right;
+margin:0 0 4px 15px;
+}
+
+.readmore {
+margin:-10px 10px 12px 0;
+text-align:right;
+}
+
+.timestamp {
+font-size:1.2em;
+margin:-5px 0 15px 10px;
+}
+
+.timestamp a {
+font-weight:normal;
+}
+
+.blue {
+color:#4088b8;
+}
+
+.clear {
+clear:both;
+}
+
+.fade {
+color:#c8c8c8;
+}
+
+.gray {
+color:gray;
+}
+
+.photo {
+background:#fff;
+border:1px solid #bababa;
+margin:6px 18px 2px 5px;
+padding:2px;
 }
@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+class DesignEditorTest < Test::Unit::TestCase
+
+  def setup
+    @controller = DesignHelperTestController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Design.public_filesystem_root = File.join(File.dirname(__FILE__))
+  end
+
+  def teardown
+    Design.public_filesystem_root = nil
+  end
+
+end
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+require File.join(File.dirname(__FILE__), 'test_helper')
	2	+
	3	+class DesignEditorTest < Test::Unit::TestCase
	4	+
	5	+ def setup
	6	+ @controller = DesignHelperTestController.new
	7	+ @request = ActionController::TestRequest.new
	8	+ @response = ActionController::TestResponse.new
	9	+
	10	+ Design.public_filesystem_root = File.join(File.dirname(__FILE__))
	11	+ end
	12	+
	13	+ def teardown
	14	+ Design.public_filesystem_root = nil
	15	+ end
	16	+
	17	+end