Commit f82f19554c4c69e12e01f48535bb48302090a7ce
Committed by
Rodrigo Souto
1 parent
f013c65a
Exists in
master
and in
22 other branches
Add new layout template with 4 boxes
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Showing
12 changed files
with
590 additions
and
7 deletions
Show diff stats
app/models/environment.rb
| @@ -172,7 +172,7 @@ class Environment < ActiveRecord::Base | @@ -172,7 +172,7 @@ class Environment < ActiveRecord::Base | ||
| 172 | acts_as_having_boxes | 172 | acts_as_having_boxes |
| 173 | 173 | ||
| 174 | after_create do |env| | 174 | after_create do |env| |
| 175 | - 3.times do | 175 | + 4.times do |
| 176 | env.boxes << Box.new | 176 | env.boxes << Box.new |
| 177 | end | 177 | end |
| 178 | 178 | ||
| @@ -737,8 +737,8 @@ class Environment < ActiveRecord::Base | @@ -737,8 +737,8 @@ class Environment < ActiveRecord::Base | ||
| 737 | end | 737 | end |
| 738 | 738 | ||
| 739 | def is_default_template?(template) | 739 | def is_default_template?(template) |
| 740 | - is_default = template == community_default_template | ||
| 741 | - is_default = is_default || template == person_default_template | 740 | + is_default = template == community_default_template |
| 741 | + is_default = is_default || template == person_default_template | ||
| 742 | is_default = is_default || template == enterprise_default_template | 742 | is_default = is_default || template == enterprise_default_template |
| 743 | is_default | 743 | is_default |
| 744 | end | 744 | end |
app/models/profile.rb
| @@ -362,7 +362,7 @@ class Profile < ActiveRecord::Base | @@ -362,7 +362,7 @@ class Profile < ActiveRecord::Base | ||
| 362 | if template | 362 | if template |
| 363 | apply_template(template, :copy_articles => false) | 363 | apply_template(template, :copy_articles => false) |
| 364 | else | 364 | else |
| 365 | - 3.times do | 365 | + 4.times do |
| 366 | self.boxes << Box.new | 366 | self.boxes << Box.new |
| 367 | end | 367 | end |
| 368 | 368 |
| @@ -0,0 +1,20 @@ | @@ -0,0 +1,20 @@ | ||
| 1 | +Feature: Change appearance | ||
| 2 | + As a user | ||
| 3 | + I want to change the appearance of my profile page | ||
| 4 | + | ||
| 5 | + Background: | ||
| 6 | + Given the following users | ||
| 7 | + | login | name | | ||
| 8 | + | joaosilva | Joao Silva | | ||
| 9 | + | ||
| 10 | + Scenario: Change appearance from default(3 boxes) to Left Top and Right(4 boxes) | ||
| 11 | + Given I am logged in as "joaosilva" | ||
| 12 | + And I go to joaosilva's control panel | ||
| 13 | + And I follow "Edit sideboxes" | ||
| 14 | + And I should not see an element ".box-4" | ||
| 15 | + And I go to joaosilva's control panel | ||
| 16 | + And I follow "Edit Appearance" | ||
| 17 | + And I follow "Left Top and Right" | ||
| 18 | + And I go to joaosilva's control panel | ||
| 19 | + And I follow "Edit sideboxes" | ||
| 20 | + And I should see an element ".box-4" |
features/step_definitions/noosfero_steps.rb
| @@ -94,7 +94,7 @@ Given /^the following blocks$/ do |table| | @@ -94,7 +94,7 @@ Given /^the following blocks$/ do |table| | ||
| 94 | owner.boxes<< Box.new | 94 | owner.boxes<< Box.new |
| 95 | owner.boxes.first.blocks << MainBlock.new | 95 | owner.boxes.first.blocks << MainBlock.new |
| 96 | end | 96 | end |
| 97 | - box_id = owner.boxes.last.id | 97 | + box_id = owner.boxes[-2].id |
| 98 | klass.constantize.create!(item.merge(:box_id => box_id)) | 98 | klass.constantize.create!(item.merge(:box_id => box_id)) |
| 99 | end | 99 | end |
| 100 | end | 100 | end |
public/designs/templates/lefttopright/stylesheets/style.css
0 → 100644
| @@ -0,0 +1,39 @@ | @@ -0,0 +1,39 @@ | ||
| 1 | +#boxes { | ||
| 2 | + display: table; | ||
| 3 | + width: 100%; | ||
| 4 | +} | ||
| 5 | + | ||
| 6 | +.box-1 { | ||
| 7 | + width: 59%; | ||
| 8 | + float: right; | ||
| 9 | + margin-right: 5px | ||
| 10 | +} | ||
| 11 | + | ||
| 12 | +.box-3 { | ||
| 13 | + position: relative; | ||
| 14 | + float: left; | ||
| 15 | + width: 20%; | ||
| 16 | +} | ||
| 17 | + | ||
| 18 | +.box-2 { | ||
| 19 | + position: relative; | ||
| 20 | + float: right; | ||
| 21 | + width: 20%; | ||
| 22 | +} | ||
| 23 | + | ||
| 24 | +.box-4 { | ||
| 25 | + float: right; | ||
| 26 | + width: 79.5%; | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +#profile-activity ul, | ||
| 30 | +#profile-network ul, | ||
| 31 | +#profile-wall ul { | ||
| 32 | + width: 460px; | ||
| 33 | +} | ||
| 34 | +#profile-activity ul.comment-replies, | ||
| 35 | +#profile-network ul.comment-replies, | ||
| 36 | +#profile-wall ul.comment-replies { | ||
| 37 | + width: auto; | ||
| 38 | +} | ||
| 39 | + |
3.02 KB
| @@ -0,0 +1,434 @@ | @@ -0,0 +1,434 @@ | ||
| 1 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| 2 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
| 3 | + | ||
| 4 | +<svg | ||
| 5 | + xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
| 6 | + xmlns:cc="http://creativecommons.org/ns#" | ||
| 7 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
| 8 | + xmlns:svg="http://www.w3.org/2000/svg" | ||
| 9 | + xmlns="http://www.w3.org/2000/svg" | ||
| 10 | + xmlns:xlink="http://www.w3.org/1999/xlink" | ||
| 11 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
| 12 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
| 13 | + width="64px" | ||
| 14 | + height="64px" | ||
| 15 | + id="svg2383" | ||
| 16 | + sodipodi:version="0.32" | ||
| 17 | + inkscape:version="0.48.3.1 r9886" | ||
| 18 | + sodipodi:docname="thumbnail.svg" | ||
| 19 | + inkscape:output_extension="org.inkscape.output.svg.inkscape" | ||
| 20 | + inkscape:export-filename="thumbnail.png" | ||
| 21 | + inkscape:export-xdpi="90" | ||
| 22 | + inkscape:export-ydpi="90" | ||
| 23 | + version="1.1"> | ||
| 24 | + <defs | ||
| 25 | + id="defs2385"> | ||
| 26 | + <linearGradient | ||
| 27 | + id="linearGradient3263"> | ||
| 28 | + <stop | ||
| 29 | + id="stop3265" | ||
| 30 | + offset="0" | ||
| 31 | + style="stop-color:#204a87;stop-opacity:1" /> | ||
| 32 | + <stop | ||
| 33 | + id="stop3267" | ||
| 34 | + offset="1" | ||
| 35 | + style="stop-color:#729fcf;stop-opacity:1" /> | ||
| 36 | + </linearGradient> | ||
| 37 | + <linearGradient | ||
| 38 | + id="linearGradient3257" | ||
| 39 | + inkscape:collect="always"> | ||
| 40 | + <stop | ||
| 41 | + id="stop3259" | ||
| 42 | + offset="0" | ||
| 43 | + style="stop-color:#204a87;stop-opacity:1" /> | ||
| 44 | + <stop | ||
| 45 | + id="stop3261" | ||
| 46 | + offset="1" | ||
| 47 | + style="stop-color:#729fcf;stop-opacity:1" /> | ||
| 48 | + </linearGradient> | ||
| 49 | + <linearGradient | ||
| 50 | + inkscape:collect="always" | ||
| 51 | + id="linearGradient3245"> | ||
| 52 | + <stop | ||
| 53 | + style="stop-color:#204a87;stop-opacity:1" | ||
| 54 | + offset="0" | ||
| 55 | + id="stop3247" /> | ||
| 56 | + <stop | ||
| 57 | + style="stop-color:#729fcf;stop-opacity:1" | ||
| 58 | + offset="1" | ||
| 59 | + id="stop3249" /> | ||
| 60 | + </linearGradient> | ||
| 61 | + <inkscape:perspective | ||
| 62 | + sodipodi:type="inkscape:persp3d" | ||
| 63 | + inkscape:vp_x="0 : 32 : 1" | ||
| 64 | + inkscape:vp_y="0 : 1000 : 0" | ||
| 65 | + inkscape:vp_z="64 : 32 : 1" | ||
| 66 | + inkscape:persp3d-origin="32 : 21.333333 : 1" | ||
| 67 | + id="perspective2391" /> | ||
| 68 | + <filter | ||
| 69 | + inkscape:collect="always" | ||
| 70 | + id="filter3241"> | ||
| 71 | + <feGaussianBlur | ||
| 72 | + inkscape:collect="always" | ||
| 73 | + stdDeviation="0.9075" | ||
| 74 | + id="feGaussianBlur3243" /> | ||
| 75 | + </filter> | ||
| 76 | + <linearGradient | ||
| 77 | + inkscape:collect="always" | ||
| 78 | + xlink:href="#linearGradient3245" | ||
| 79 | + id="linearGradient3251" | ||
| 80 | + x1="11.5" | ||
| 81 | + y1="60.5" | ||
| 82 | + x2="3.5" | ||
| 83 | + y2="3.5" | ||
| 84 | + gradientUnits="userSpaceOnUse" | ||
| 85 | + gradientTransform="translate(2,0)" /> | ||
| 86 | + <linearGradient | ||
| 87 | + inkscape:collect="always" | ||
| 88 | + xlink:href="#linearGradient3263" | ||
| 89 | + id="linearGradient3253" | ||
| 90 | + x1="49.5" | ||
| 91 | + y1="60.5" | ||
| 92 | + x2="23.5" | ||
| 93 | + y2="3.5" | ||
| 94 | + gradientUnits="userSpaceOnUse" | ||
| 95 | + gradientTransform="translate(2,0)" /> | ||
| 96 | + <linearGradient | ||
| 97 | + inkscape:collect="always" | ||
| 98 | + xlink:href="#linearGradient3257" | ||
| 99 | + id="linearGradient3255" | ||
| 100 | + x1="60.5" | ||
| 101 | + y1="60.5" | ||
| 102 | + x2="51.5" | ||
| 103 | + y2="3.5" | ||
| 104 | + gradientUnits="userSpaceOnUse" /> | ||
| 105 | + <filter | ||
| 106 | + color-interpolation-filters="sRGB" | ||
| 107 | + inkscape:collect="always" | ||
| 108 | + id="filter3241-2"> | ||
| 109 | + <feGaussianBlur | ||
| 110 | + inkscape:collect="always" | ||
| 111 | + stdDeviation="0.9075" | ||
| 112 | + id="feGaussianBlur3243-4" /> | ||
| 113 | + </filter> | ||
| 114 | + <linearGradient | ||
| 115 | + inkscape:collect="always" | ||
| 116 | + xlink:href="#linearGradient3245-1" | ||
| 117 | + id="linearGradient3251-0" | ||
| 118 | + x1="11.5" | ||
| 119 | + y1="60.5" | ||
| 120 | + x2="3.5" | ||
| 121 | + y2="3.5" | ||
| 122 | + gradientUnits="userSpaceOnUse" | ||
| 123 | + gradientTransform="translate(249.71429,298.93361)" /> | ||
| 124 | + <linearGradient | ||
| 125 | + inkscape:collect="always" | ||
| 126 | + id="linearGradient3245-1"> | ||
| 127 | + <stop | ||
| 128 | + style="stop-color:#204a87;stop-opacity:1" | ||
| 129 | + offset="0" | ||
| 130 | + id="stop3247-6" /> | ||
| 131 | + <stop | ||
| 132 | + style="stop-color:#729fcf;stop-opacity:1" | ||
| 133 | + offset="1" | ||
| 134 | + id="stop3249-5" /> | ||
| 135 | + </linearGradient> | ||
| 136 | + <filter | ||
| 137 | + color-interpolation-filters="sRGB" | ||
| 138 | + inkscape:collect="always" | ||
| 139 | + id="filter3241-4-8"> | ||
| 140 | + <feGaussianBlur | ||
| 141 | + inkscape:collect="always" | ||
| 142 | + stdDeviation="0.9075" | ||
| 143 | + id="feGaussianBlur3243-0-7" /> | ||
| 144 | + </filter> | ||
| 145 | + <linearGradient | ||
| 146 | + inkscape:collect="always" | ||
| 147 | + xlink:href="#linearGradient3263-5-8" | ||
| 148 | + id="linearGradient5185" | ||
| 149 | + gradientUnits="userSpaceOnUse" | ||
| 150 | + gradientTransform="matrix(1.4160224,0,0,0.76166072,243.22589,313.33388)" | ||
| 151 | + x1="42.5" | ||
| 152 | + y1="60.5" | ||
| 153 | + x2="19.5" | ||
| 154 | + y2="3.5" /> | ||
| 155 | + <linearGradient | ||
| 156 | + id="linearGradient3263-5-8"> | ||
| 157 | + <stop | ||
| 158 | + id="stop3265-4-3" | ||
| 159 | + offset="0" | ||
| 160 | + style="stop-color:#204a87;stop-opacity:1" /> | ||
| 161 | + <stop | ||
| 162 | + id="stop3267-2-4" | ||
| 163 | + offset="1" | ||
| 164 | + style="stop-color:#729fcf;stop-opacity:1" /> | ||
| 165 | + </linearGradient> | ||
| 166 | + <filter | ||
| 167 | + color-interpolation-filters="sRGB" | ||
| 168 | + inkscape:collect="always" | ||
| 169 | + id="filter3241-0"> | ||
| 170 | + <feGaussianBlur | ||
| 171 | + inkscape:collect="always" | ||
| 172 | + stdDeviation="0.9075" | ||
| 173 | + id="feGaussianBlur3243-3" /> | ||
| 174 | + </filter> | ||
| 175 | + <linearGradient | ||
| 176 | + inkscape:collect="always" | ||
| 177 | + xlink:href="#linearGradient3245-7" | ||
| 178 | + id="linearGradient5168" | ||
| 179 | + gradientUnits="userSpaceOnUse" | ||
| 180 | + gradientTransform="matrix(1.0025263,0,0,0.76423683,344.68831,300.13218)" | ||
| 181 | + x1="11.5" | ||
| 182 | + y1="60.5" | ||
| 183 | + x2="3.5" | ||
| 184 | + y2="3.5" /> | ||
| 185 | + <linearGradient | ||
| 186 | + inkscape:collect="always" | ||
| 187 | + id="linearGradient3245-7"> | ||
| 188 | + <stop | ||
| 189 | + style="stop-color:#204a87;stop-opacity:1" | ||
| 190 | + offset="0" | ||
| 191 | + id="stop3247-0" /> | ||
| 192 | + <stop | ||
| 193 | + style="stop-color:#729fcf;stop-opacity:1" | ||
| 194 | + offset="1" | ||
| 195 | + id="stop3249-7" /> | ||
| 196 | + </linearGradient> | ||
| 197 | + <linearGradient | ||
| 198 | + inkscape:collect="always" | ||
| 199 | + xlink:href="#linearGradient3245-70" | ||
| 200 | + id="linearGradient3251-55" | ||
| 201 | + x1="11.5" | ||
| 202 | + y1="60.5" | ||
| 203 | + x2="3.5" | ||
| 204 | + y2="3.5" | ||
| 205 | + gradientUnits="userSpaceOnUse" | ||
| 206 | + gradientTransform="matrix(1.0025263,0,0,0.76423683,344.68831,300.13218)" /> | ||
| 207 | + <linearGradient | ||
| 208 | + inkscape:collect="always" | ||
| 209 | + id="linearGradient3245-70"> | ||
| 210 | + <stop | ||
| 211 | + style="stop-color:#204a87;stop-opacity:1" | ||
| 212 | + offset="0" | ||
| 213 | + id="stop3247-2" /> | ||
| 214 | + <stop | ||
| 215 | + style="stop-color:#729fcf;stop-opacity:1" | ||
| 216 | + offset="1" | ||
| 217 | + id="stop3249-87" /> | ||
| 218 | + </linearGradient> | ||
| 219 | + <linearGradient | ||
| 220 | + inkscape:collect="always" | ||
| 221 | + xlink:href="#linearGradient3245-1" | ||
| 222 | + id="linearGradient5832" | ||
| 223 | + gradientUnits="userSpaceOnUse" | ||
| 224 | + gradientTransform="translate(249.71429,298.93361)" | ||
| 225 | + x1="11.5" | ||
| 226 | + y1="60.5" | ||
| 227 | + x2="3.5" | ||
| 228 | + y2="3.5" /> | ||
| 229 | + <linearGradient | ||
| 230 | + inkscape:collect="always" | ||
| 231 | + xlink:href="#linearGradient3263-5-8" | ||
| 232 | + id="linearGradient5834" | ||
| 233 | + gradientUnits="userSpaceOnUse" | ||
| 234 | + gradientTransform="matrix(1.4160224,0,0,0.76166072,243.22589,313.33388)" | ||
| 235 | + x1="42.5" | ||
| 236 | + y1="60.5" | ||
| 237 | + x2="19.5" | ||
| 238 | + y2="3.5" /> | ||
| 239 | + <linearGradient | ||
| 240 | + inkscape:collect="always" | ||
| 241 | + xlink:href="#linearGradient3245-7" | ||
| 242 | + id="linearGradient5836" | ||
| 243 | + gradientUnits="userSpaceOnUse" | ||
| 244 | + gradientTransform="matrix(1.0025263,0,0,0.76423683,344.68831,300.13218)" | ||
| 245 | + x1="11.5" | ||
| 246 | + y1="60.5" | ||
| 247 | + x2="3.5" | ||
| 248 | + y2="3.5" /> | ||
| 249 | + <linearGradient | ||
| 250 | + inkscape:collect="always" | ||
| 251 | + xlink:href="#linearGradient3245-70" | ||
| 252 | + id="linearGradient5838" | ||
| 253 | + gradientUnits="userSpaceOnUse" | ||
| 254 | + gradientTransform="matrix(1.0025263,0,0,0.76423683,344.68831,300.13218)" | ||
| 255 | + x1="11.5" | ||
| 256 | + y1="60.5" | ||
| 257 | + x2="3.5" | ||
| 258 | + y2="3.5" /> | ||
| 259 | + </defs> | ||
| 260 | + <sodipodi:namedview | ||
| 261 | + id="base" | ||
| 262 | + pagecolor="#ffffff" | ||
| 263 | + bordercolor="#666666" | ||
| 264 | + borderopacity="1.0" | ||
| 265 | + inkscape:pageopacity="0.0" | ||
| 266 | + inkscape:pageshadow="2" | ||
| 267 | + inkscape:zoom="2.5351563" | ||
| 268 | + inkscape:cx="-16.066434" | ||
| 269 | + inkscape:cy="0.12147739" | ||
| 270 | + inkscape:current-layer="layer1" | ||
| 271 | + showgrid="true" | ||
| 272 | + inkscape:document-units="px" | ||
| 273 | + inkscape:grid-bbox="true" | ||
| 274 | + inkscape:window-width="1364" | ||
| 275 | + inkscape:window-height="678" | ||
| 276 | + inkscape:window-x="0" | ||
| 277 | + inkscape:window-y="27" | ||
| 278 | + objecttolerance="10" | ||
| 279 | + gridtolerance="10" | ||
| 280 | + guidetolerance="10" | ||
| 281 | + inkscape:window-maximized="0"> | ||
| 282 | + <inkscape:grid | ||
| 283 | + type="xygrid" | ||
| 284 | + id="grid2382" | ||
| 285 | + visible="true" | ||
| 286 | + enabled="true" | ||
| 287 | + originx="0.5px" | ||
| 288 | + originy="0.5px" | ||
| 289 | + empcolor="#0000ff" | ||
| 290 | + empopacity="0.1254902" | ||
| 291 | + dotted="true" /> | ||
| 292 | + </sodipodi:namedview> | ||
| 293 | + <metadata | ||
| 294 | + id="metadata2388"> | ||
| 295 | + <rdf:RDF> | ||
| 296 | + <cc:Work | ||
| 297 | + rdf:about=""> | ||
| 298 | + <dc:format>image/svg+xml</dc:format> | ||
| 299 | + <dc:type | ||
| 300 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
| 301 | + </cc:Work> | ||
| 302 | + </rdf:RDF> | ||
| 303 | + </metadata> | ||
| 304 | + <g | ||
| 305 | + id="layer1" | ||
| 306 | + inkscape:label="Layer 1" | ||
| 307 | + inkscape:groupmode="layer"> | ||
| 308 | + <g | ||
| 309 | + transform="translate(-247.62879,-298.93361)" | ||
| 310 | + id="g5187"> | ||
| 311 | + <g | ||
| 312 | + id="g4846"> | ||
| 313 | + <g | ||
| 314 | + id="g3190-2" | ||
| 315 | + style="opacity:0.4;filter:url(#filter3241-2)" | ||
| 316 | + transform="translate(250.71429,299.93361)"> | ||
| 317 | + <rect | ||
| 318 | + y="1.5" | ||
| 319 | + x="1.5" | ||
| 320 | + height="59" | ||
| 321 | + width="11" | ||
| 322 | + id="rect3184-1" | ||
| 323 | + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 324 | + ry="2" | ||
| 325 | + rx="2" /> | ||
| 326 | + </g> | ||
| 327 | + <rect | ||
| 328 | + y="300.43362" | ||
| 329 | + x="251.21428" | ||
| 330 | + height="59" | ||
| 331 | + width="11" | ||
| 332 | + id="rect2395-8" | ||
| 333 | + style="fill:url(#linearGradient5832);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 334 | + ry="2" | ||
| 335 | + rx="2" /> | ||
| 336 | + <rect | ||
| 337 | + ry="1" | ||
| 338 | + style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 339 | + id="rect3158-7" | ||
| 340 | + width="9" | ||
| 341 | + height="57" | ||
| 342 | + x="252.21428" | ||
| 343 | + y="301.43362" | ||
| 344 | + rx="1" /> | ||
| 345 | + </g> | ||
| 346 | + <g | ||
| 347 | + transform="matrix(0.69260722,0,0,1,81.51265,0)" | ||
| 348 | + id="g5180"> | ||
| 349 | + <rect | ||
| 350 | + rx="2" | ||
| 351 | + ry="2" | ||
| 352 | + style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3241-4-8);enable-background:accumulate" | ||
| 353 | + id="rect3188-8" | ||
| 354 | + width="31" | ||
| 355 | + height="59" | ||
| 356 | + x="16.5" | ||
| 357 | + y="2.5" | ||
| 358 | + transform="matrix(1.4160224,0,0,0.76166071,243.80989,314.09132)" /> | ||
| 359 | + <rect | ||
| 360 | + y="314.47638" | ||
| 361 | + x="265.17426" | ||
| 362 | + height="44.937984" | ||
| 363 | + width="43.896694" | ||
| 364 | + id="rect3156-3" | ||
| 365 | + style="fill:url(#linearGradient5834);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1.03852236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 366 | + ry="1.5233214" /> | ||
| 367 | + <rect | ||
| 368 | + y="315.23804" | ||
| 369 | + x="266.59027" | ||
| 370 | + height="43.414661" | ||
| 371 | + width="41.064651" | ||
| 372 | + id="rect3162-1" | ||
| 373 | + style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1.03852236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 374 | + ry="0.7616607" | ||
| 375 | + inkscape:export-xdpi="90" | ||
| 376 | + inkscape:export-ydpi="90" /> | ||
| 377 | + </g> | ||
| 378 | + <g | ||
| 379 | + transform="matrix(0.9761091,0,0,1,6.3333026,0)" | ||
| 380 | + id="g5108"> | ||
| 381 | + <rect | ||
| 382 | + rx="2" | ||
| 383 | + ry="2" | ||
| 384 | + style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3241-0);enable-background:accumulate" | ||
| 385 | + id="rect3184-5" | ||
| 386 | + width="11" | ||
| 387 | + height="59" | ||
| 388 | + x="2.5" | ||
| 389 | + y="2.5" | ||
| 390 | + transform="matrix(0,1.0025263,-0.76423683,0,312.09322,298.92289)" /> | ||
| 391 | + <g | ||
| 392 | + transform="matrix(0,1,-1,0,611.46116,-45.820829)" | ||
| 393 | + id="g4877-9"> | ||
| 394 | + <rect | ||
| 395 | + ry="1.5284736" | ||
| 396 | + style="fill:url(#linearGradient5836);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.87531;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 397 | + id="rect2395-95" | ||
| 398 | + width="11.02779" | ||
| 399 | + height="45.089973" | ||
| 400 | + x="346.19211" | ||
| 401 | + y="301.27853" /> | ||
| 402 | + <rect | ||
| 403 | + y="302.04276" | ||
| 404 | + x="347.19461" | ||
| 405 | + height="43.561501" | ||
| 406 | + width="9.0227375" | ||
| 407 | + id="rect3158-2" | ||
| 408 | + style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:0.87531;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 409 | + ry="0.76423681" /> | ||
| 410 | + </g> | ||
| 411 | + </g> | ||
| 412 | + <g | ||
| 413 | + id="g4877-8" | ||
| 414 | + transform="translate(-47.956003,13.002947)"> | ||
| 415 | + <rect | ||
| 416 | + y="301.27853" | ||
| 417 | + x="346.19211" | ||
| 418 | + height="45.089973" | ||
| 419 | + width="11.02779" | ||
| 420 | + id="rect2395-1" | ||
| 421 | + style="fill:url(#linearGradient5838);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.87531;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 422 | + ry="1.5284736" /> | ||
| 423 | + <rect | ||
| 424 | + ry="0.76423681" | ||
| 425 | + style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:0.87531;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 426 | + id="rect3158-71" | ||
| 427 | + width="9.0227375" | ||
| 428 | + height="43.561501" | ||
| 429 | + x="347.19461" | ||
| 430 | + y="302.04276" /> | ||
| 431 | + </g> | ||
| 432 | + </g> | ||
| 433 | + </g> | ||
| 434 | +</svg> |
1.14 KB
| @@ -0,0 +1,83 @@ | @@ -0,0 +1,83 @@ | ||
| 1 | +<?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| 2 | +<!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
| 3 | + | ||
| 4 | +<svg | ||
| 5 | + xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
| 6 | + xmlns:cc="http://creativecommons.org/ns#" | ||
| 7 | + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
| 8 | + xmlns:svg="http://www.w3.org/2000/svg" | ||
| 9 | + xmlns="http://www.w3.org/2000/svg" | ||
| 10 | + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
| 11 | + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
| 12 | + width="64" | ||
| 13 | + height="64" | ||
| 14 | + id="svg2" | ||
| 15 | + sodipodi:version="0.32" | ||
| 16 | + inkscape:version="0.48.3.1 r9886" | ||
| 17 | + version="1.0" | ||
| 18 | + sodipodi:docname="4.svg" | ||
| 19 | + inkscape:output_extension="org.inkscape.output.svg.inkscape" | ||
| 20 | + inkscape:export-filename="/home/noosfero/sites/noosfero/public/images/blocks/4.png" | ||
| 21 | + inkscape:export-xdpi="87.968124" | ||
| 22 | + inkscape:export-ydpi="87.968124"> | ||
| 23 | + <defs | ||
| 24 | + id="defs4" /> | ||
| 25 | + <sodipodi:namedview | ||
| 26 | + id="base" | ||
| 27 | + pagecolor="#ffffff" | ||
| 28 | + bordercolor="#666666" | ||
| 29 | + borderopacity="1.0" | ||
| 30 | + inkscape:pageopacity="0.0" | ||
| 31 | + inkscape:pageshadow="2" | ||
| 32 | + inkscape:zoom="5.921875" | ||
| 33 | + inkscape:cx="32" | ||
| 34 | + inkscape:cy="32" | ||
| 35 | + inkscape:document-units="px" | ||
| 36 | + inkscape:current-layer="layer1" | ||
| 37 | + width="64px" | ||
| 38 | + height="64px" | ||
| 39 | + inkscape:window-width="1366" | ||
| 40 | + inkscape:window-height="681" | ||
| 41 | + inkscape:window-x="0" | ||
| 42 | + inkscape:window-y="27" | ||
| 43 | + showgrid="false" | ||
| 44 | + inkscape:window-maximized="1" /> | ||
| 45 | + <metadata | ||
| 46 | + id="metadata7"> | ||
| 47 | + <rdf:RDF> | ||
| 48 | + <cc:Work | ||
| 49 | + rdf:about=""> | ||
| 50 | + <dc:format>image/svg+xml</dc:format> | ||
| 51 | + <dc:type | ||
| 52 | + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
| 53 | + <dc:title></dc:title> | ||
| 54 | + </cc:Work> | ||
| 55 | + </rdf:RDF> | ||
| 56 | + </metadata> | ||
| 57 | + <g | ||
| 58 | + inkscape:label="Camada 1" | ||
| 59 | + inkscape:groupmode="layer" | ||
| 60 | + id="layer1"> | ||
| 61 | + <path | ||
| 62 | + sodipodi:type="arc" | ||
| 63 | + style="fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.19607843" | ||
| 64 | + id="path2162" | ||
| 65 | + sodipodi:cx="24.12665" | ||
| 66 | + sodipodi:cy="24.063324" | ||
| 67 | + sodipodi:rx="21.593668" | ||
| 68 | + sodipodi:ry="21.277044" | ||
| 69 | + d="M 45.720318 24.063324 A 21.593668 21.277044 0 1 1 2.5329819,24.063324 A 21.593668 21.277044 0 1 1 45.720318 24.063324 z" | ||
| 70 | + transform="translate(7.8733501,7.936676)" /> | ||
| 71 | + <text | ||
| 72 | + xml:space="preserve" | ||
| 73 | + style="font-size:42.00993729px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:0.19607843;stroke:none;font-family:FreeSans" | ||
| 74 | + x="16.267668" | ||
| 75 | + y="47.399117" | ||
| 76 | + id="text3134" | ||
| 77 | + sodipodi:linespacing="125%"><tspan | ||
| 78 | + sodipodi:role="line" | ||
| 79 | + id="tspan3136" | ||
| 80 | + x="16.267668" | ||
| 81 | + y="47.399117">4</tspan></text> | ||
| 82 | + </g> | ||
| 83 | +</svg> |
public/stylesheets/application.css
| @@ -1842,6 +1842,9 @@ a.button.disabled, input.disabled { | @@ -1842,6 +1842,9 @@ a.button.disabled, input.disabled { | ||
| 1842 | #box-organizer div.box-3 { | 1842 | #box-organizer div.box-3 { |
| 1843 | background-image: url(../images/blocks/3.png); | 1843 | background-image: url(../images/blocks/3.png); |
| 1844 | } | 1844 | } |
| 1845 | +#box-organizer div.box-4 { | ||
| 1846 | + background-image: url(../images/blocks/4.png); | ||
| 1847 | +} | ||
| 1845 | #box-organizer .block { | 1848 | #box-organizer .block { |
| 1846 | cursor: move; | 1849 | cursor: move; |
| 1847 | } | 1850 | } |
test/unit/enterprise_test.rb
| @@ -188,7 +188,7 @@ class EnterpriseTest < ActiveSupport::TestCase | @@ -188,7 +188,7 @@ class EnterpriseTest < ActiveSupport::TestCase | ||
| 188 | inactive_template.save! | 188 | inactive_template.save! |
| 189 | 189 | ||
| 190 | active_template = create(Enterprise, :name => 'enteprise template', :identifier => 'enterprise_template') | 190 | active_template = create(Enterprise, :name => 'enteprise template', :identifier => 'enterprise_template') |
| 191 | - assert_equal 3, active_template.boxes.size | 191 | + assert_equal 4, active_template.boxes.size |
| 192 | 192 | ||
| 193 | e = Environment.default | 193 | e = Environment.default |
| 194 | e.inactive_enterprise_template = inactive_template | 194 | e.inactive_enterprise_template = inactive_template |
| @@ -400,7 +400,7 @@ class EnterpriseTest < ActiveSupport::TestCase | @@ -400,7 +400,7 @@ class EnterpriseTest < ActiveSupport::TestCase | ||
| 400 | e.save! | 400 | e.save! |
| 401 | 401 | ||
| 402 | ent = create(Enterprise, :name => 'test enteprise', :identifier => 'test_ent') | 402 | ent = create(Enterprise, :name => 'test enteprise', :identifier => 'test_ent') |
| 403 | - assert_equal 3, ent.boxes.size | 403 | + assert_equal 4, ent.boxes.size |
| 404 | end | 404 | end |
| 405 | 405 | ||
| 406 | should 'collect the highlighted products with image' do | 406 | should 'collect the highlighted products with image' do |