Download as
Browse Code »

Commit 53449db853269059e21c17629cccdee90b6115d7

Authored by LeandroNunes
1 parent 29ccb927
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem0: fixing bug in design plugin on edit mode. 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@309 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 169 additions and 158 deletions   Show diff stats
app/controllers/edit_template_controller.rb
  Diff comments   View file @53449db
1 1 class EditTemplateController < ApplicationController
2 2  
3   - design_editor :holder => 'virtual_community', :autosave => true
4   -
  3 + design_editor :holder => 'virtual_community', :autosave => true, :block_types => :block_types
  4 +
  5 + #TODO Implements the available blocks here
  6 + #TODO implements available helpers
  7 +
5 8 def index
6 9 redirect_to :action => 'design_editor'
7 10 end
... ...
app/views/account/login.rhtml
  Diff comments   View file @53449db
1 1 <h1><%= _('Login') %></h1>
2 2  
3 3 <% form_tag do -%>
4   -<p><label for="login">Login</label><br/>
  4 +<p><label for="login"> <%= _('Login') %> </label><br/>
5 5 <%= text_field_tag 'login' %></p>
6 6  
7   -<p><label for="password">Password</label><br/>
  7 +<p><label for="password"> <%= _('Password') %></label><br/>
8 8 <%= password_field_tag 'password' %></p>
9 9  
10 10 <!-- Uncomment this if you want this functionality
... ...
public/designs/templates/1024px/simple.yml
  Diff comments   View file @53449db
1 1 title: "1024 px"
2   -number_of_boxes: 3
  2 +number_of_boxes: 2
... ...
public/designs/templates/default/stylesheets/style.css
  Diff comments   View file @53449db
... ... @@ -34,3 +34,11 @@ body {
34 34 padding: 0.5em;
35 35 }
36 36  
  37 +#box_1, #box_2, #box_3 {
  38 + border: 1px solid black;
  39 + margin: 10px;
  40 +}
  41 +
  42 +#box_1 li, #box_2 li, #box_3 li {
  43 + border: 1px solid black;
  44 +}
... ...
public/designs/templates/gray/stylesheets/style.css
  Diff comments   View file @53449db
1   -/*
2   -This stylesheet is part of the [in] business template downloaded from the oswd.org site
3   -
4   -The stylesheet and template where made by Tjobbe Andrews from NOW:design www.now-design.co.uk
5   -*/
6   -html {
7   - width: 100%
8   -}
9   -
10   -body {
11   - font-family: "Trebuchet MS", verdana, arial, "Times New Roman";
12   - font-size: 90%;
13   - color: #3D3535;
14   - background-color: #E4E5E0;
15   - margin: 0px;
16   - padding: 0px;
  1 +/*
  2 +This stylesheet is part of the [in] business template downloaded from the oswd.org site
  3 +
  4 +The stylesheet and template where made by Tjobbe Andrews from NOW:design www.now-design.co.uk
  5 +*/
  6 +html {
  7 + width: 100%
  8 +}
  9 +
  10 +body {
  11 + font-family: "Trebuchet MS", verdana, arial, "Times New Roman";
  12 + font-size: 90%;
  13 + color: #3D3535;
  14 + background-color: #E4E5E0;
  15 + margin: 0px;
  16 + padding: 0px;
17 17 line-height: 140%;
18   -
19   -}
20   -
21   -/* Wrapper */
22   -#wrap {
23   - text-align: center;
  18 +
  19 +}
  20 +
  21 +/* Wrapper */
  22 +#wrap {
  23 + text-align: center;
24 24 width: 100%;
25 25 background-color: #E4E5E0;
26   -}
27   -
28   -/* the container */
29   -#frame {
  26 +}
  27 +
  28 +/* the container */
  29 +#frame {
30 30 background-color: #FFFFFF;
31   - margin-left: auto;
  31 + margin-left: auto;
32 32 margin-right: auto;
33 33 padding: 20px;
34   - text-align: left;
35   - width: 90%;
36   -}
37   -
38   -/*holds the tabs at the top*/
39   -#menu {
40   - background-color: #FFFFFF;
41   - text-align: right;
42   - border-bottom: 1px solid #FFFFFF;
43   -}
44   -
45   -/*holds the logo and image*/
46   -#header {
47   - background-color: #EDEEEA;
48   - padding: 10px;
49   - margin-top:3px;
  34 + text-align: left;
  35 + width: 90%;
  36 +}
  37 +
  38 +/*holds the tabs at the top*/
  39 +#menu {
  40 + background-color: #FFFFFF;
  41 + text-align: right;
  42 + border-bottom: 1px solid #FFFFFF;
  43 +}
  44 +
  45 +/*holds the logo and image*/
  46 +#header {
  47 + background-color: #EDEEEA;
  48 + padding: 10px;
  49 + margin-top:3px;
50 50 height: 95px;
51   - background: #EDEEEA url(../images/www.jpg) no-repeat right top;
52   -}
53   -
54   -/*defines the colours for the tabs, with corner background images*/
55   -#menu a:link, #menu a:active, #menu a:visited {
56   - background: #EDEEEA url(../images/corner.gif) no-repeat right top;
57   - color: #3D3535;
58   - text-decoration: none;
59   - padding: 3px 7px 3px 7px;
60   - margin: 0 0 0 4px;
61   -}
62   -
63   -#menu a:hover {
64   - background: #D6D8CF url(../images/corner2.gif) no-repeat right top;
65   - color: #000000;
66   - text-decoration: none;
67   - padding: 3px 7px 3px 7px;
68   - margin: 0 0 0 4px;
69   -}
70   -
71   -/*just a fix, taken from http://www.positioniseverything.net/easyclearing.html*/
72   -.clearfix:after {
73   - content: ".";
74   - display: block;
75   - height: 0;
76   - clear: both;
77   - visibility: hidden;
78   -}
79   -
80   -.clearfix {
81   - display: inline-table;
82   -}
83   -
84   -/* Hides from IE-mac \*/
85   -* html .clearfix {
86   - height: 1%;
87   -}
88   -
89   -.clearfix {
90   - display: block;
91   -}
92   -/* End hide from IE-mac */
93   -
94   -/*the main text container*/
95   -#box_2 {
96   - height: 600px;
97   -}
98   -
99   -#box_2 h1 {
100   - font-size: 110%;
101   - margin: 10px 0px 0px 0px;
102   - padding: 0px 0px 0px 0px;
103   - border-bottom: 2px solid #A53512;
104   -}
105   -
106   -/*this is the right hand bar, news bar, links bar w/e*/
107   -#box_1 {
  51 + background: #EDEEEA url(../images/www.jpg) no-repeat right top;
  52 +}
  53 +
  54 +/*defines the colours for the tabs, with corner background images*/
  55 +#menu a:link, #menu a:active, #menu a:visited {
  56 + background: #EDEEEA url(../images/corner.gif) no-repeat right top;
  57 + color: #3D3535;
  58 + text-decoration: none;
  59 + padding: 3px 7px 3px 7px;
  60 + margin: 0 0 0 4px;
  61 +}
  62 +
  63 +#menu a:hover {
  64 + background: #D6D8CF url(../images/corner2.gif) no-repeat right top;
  65 + color: #000000;
  66 + text-decoration: none;
  67 + padding: 3px 7px 3px 7px;
  68 + margin: 0 0 0 4px;
  69 +}
  70 +
  71 +/*just a fix, taken from http://www.positioniseverything.net/easyclearing.html*/
  72 +.clearfix:after {
  73 + content: ".";
  74 + display: block;
  75 + height: 0;
  76 + clear: both;
  77 + visibility: hidden;
  78 +}
  79 +
  80 +.clearfix {
  81 + display: inline-table;
  82 +}
  83 +
  84 +/* Hides from IE-mac \*/
  85 +* html .clearfix {
  86 + height: 1%;
  87 +}
  88 +
  89 +.clearfix {
  90 + display: block;
  91 +}
  92 +/* End hide from IE-mac */
  93 +
  94 +/*the main text container*/
  95 +#box_2 {
  96 + height: 600px;
  97 +}
  98 +
  99 +#box_2 h1 {
  100 + font-size: 110%;
  101 + margin: 10px 0px 0px 0px;
  102 + padding: 0px 0px 0px 0px;
  103 + border-bottom: 2px solid #A53512;
  104 +}
  105 +
  106 +/*this is the right hand bar, news bar, links bar w/e*/
  107 +#box_1 {
108 108 margin-top: 20px;
109   - padding-left: 20px;
110   - width: 245px;
  109 + padding-left: 20px;
  110 + width: 245px;
111 111 float: right;
112 112 background-color: white;
113   -
114   -}
115   -
116   -#box_1 h1 {
117   - background-color: #A53512;
118   - color: #FFFFFF;
119   - padding: 3px;
120   - margin: 0px 0px 0px 0px;
121   - font-size: 100%;
122   - font-weight: normal;
123   -}
124   -
125   -/*this just lets you have a "comment" type area in the main content*/
126   -.p1 {
127   - padding: 20px;
128   - background-color: #F7F7F4;
129   - font-size:90%;
130   -}
131   -
132   -/*sets the padding for the newsbar text, not the headings*/
133   -.p2 {
134   - padding: 20px;
135   - background-color: #FFFFFF;
136   - font-size: 90%;
137   - list-style-image: url(../images/b.gif);
138   - list-style-position: 10px;
139   -}
140   -
141   -.p2 ul {
142   - margin: 0px 0px 0px 0px;
143   - padding: 0px 0px 0px 0px;
144   -}
145   -
146   -/*the footer, with copyright*/
147   -.footer {
148   -clear:both;
149   - background-color: #D6D8CF;
150   - padding: 4px;
151   - font-size: 80%;
152   - text-align: center;
153   -}
154   -
155   -/*sets the link colours and style*/
156   -a:link, a:active, a:visited {
157   - color: #A53512;
158   -}
159   -
160   -a:hover {
161   - color: #A53512;
162   - text-decoration: none;
163   -}
  113 +
  114 +}
  115 +
  116 +#box_1 h1 {
  117 + background-color: #A53512;
  118 + color: #FFFFFF;
  119 + padding: 3px;
  120 + margin: 0px 0px 0px 0px;
  121 + font-size: 100%;
  122 + font-weight: normal;
  123 +}
  124 +
  125 +/*this just lets you have a "comment" type area in the main content*/
  126 +.p1 {
  127 + padding: 20px;
  128 + background-color: #F7F7F4;
  129 + font-size:90%;
  130 +}
  131 +
  132 +/*sets the padding for the newsbar text, not the headings*/
  133 +.p2 {
  134 + padding: 20px;
  135 + background-color: #FFFFFF;
  136 + font-size: 90%;
  137 + list-style-image: url(../images/b.gif);
  138 + list-style-position: 10px;
  139 +}
  140 +
  141 +.p2 ul {
  142 + margin: 0px 0px 0px 0px;
  143 + padding: 0px 0px 0px 0px;
  144 +}
  145 +
  146 +/*the footer, with copyright*/
  147 +.footer {
  148 +clear:both;
  149 + background-color: #D6D8CF;
  150 + padding: 4px;
  151 + font-size: 80%;
  152 + text-align: center;
  153 +}
  154 +
  155 +/*sets the link colours and style*/
  156 +a:link, a:active, a:visited {
  157 + color: #A53512;
  158 +}
  159 +
  160 +a:hover {
  161 + color: #A53512;
  162 + text-decoration: none;
  163 +}
... ...