Download as
Browse Code »

Commit d75f3c8a0b926065c475eea7bd326314a391cdf1

Authored by ValessioBrito
1 parent cb2ab950
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem110: Layout Default new 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@740 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 175 additions and 34 deletions   Show diff stats
app/views/layouts/application.rhtml
  Diff comments   View file @d75f3c8
1 1 <html>
2 2 <head>
3 3 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
4   -
  4 + <title>
  5 + <% if @category %>
  6 + Noosfero &rarr; <%= @category.full_name %>
  7 + <% else %>
  8 + Noosfero
  9 + <% end %>
  10 + </title>
  11 + <meta name="description" content="FIXME: Descriptions of Noosfero" />
  12 + <meta name="keywords" content="Noosfero, Community, Open Source" />
5 13 <%= design_all_header_tags %>
6 14 <%= stylesheet_link_tag 'common' %>
7 15 <%= stylesheet_link_tag 'help' %>
... ... @@ -9,7 +17,7 @@
9 17 <%= javascript_include_tag 'menu' %>
10 18 </head>
11 19  
12   - <body onload='javascript: focusOnFirstField();'>
  20 + <body>
13 21  
14 22 <% unless flash[:notice].nil? %>
15 23 <div id='notice'>
... ...
public/artwork/screens/NoosferoTelaDeslogado.svg
  Diff comments   View file @d75f3c8
... ... @@ -795,14 +795,6 @@
795 795 d="M -692.96875,188.5 C -700.7869,188.5 -707.1875,194.90055 -707.1875,202.71875 L -707.1875,261.75 C -707.1875,269.56821 -700.7869,275.96876 -692.96875,275.96875 L -448.9375,275.96875 C -441.11931,275.96875 -434.71875,269.56819 -434.71875,261.75 L -434.71875,202.71875 C -434.71875,194.90055 -441.11933,188.5 -448.9375,188.5 L -692.96875,188.5 z"
796 796 style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.17599964;stroke-linecap:butt;stroke-linejoin:miter;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
797 797 </clipPath>
798   - <filter
799   - inkscape:collect="always"
800   - id="filter10389">
801   - <feGaussianBlur
802   - inkscape:collect="always"
803   - stdDeviation="2.6558591"
804   - id="feGaussianBlur10391" />
805   - </filter>
806 798 <clipPath
807 799 clipPathUnits="userSpaceOnUse"
808 800 id="clipPath10407">
... ... @@ -823,6 +815,15 @@
823 815 stdDeviation="2.0177276"
824 816 id="feGaussianBlur3276" />
825 817 </filter>
  818 + <linearGradient
  819 + inkscape:collect="always"
  820 + xlink:href="#linearGradient4198"
  821 + id="linearGradient2633"
  822 + gradientUnits="userSpaceOnUse"
  823 + x1="345.29486"
  824 + y1="216.60402"
  825 + x2="345.29486"
  826 + y2="659.35962" />
826 827 </defs>
827 828 <sodipodi:namedview
828 829 id="base"
... ... @@ -831,9 +832,9 @@
831 832 borderopacity="1.0"
832 833 inkscape:pageopacity="1"
833 834 inkscape:pageshadow="2"
834   - inkscape:zoom="1.3923322"
835   - inkscape:cx="408.42241"
836   - inkscape:cy="105.07072"
  835 + inkscape:zoom="2.8284271"
  836 + inkscape:cx="1205.9198"
  837 + inkscape:cy="71.319666"
837 838 inkscape:document-units="px"
838 839 inkscape:current-layer="layer1"
839 840 height="700px"
... ... @@ -1742,5 +1743,123 @@
1742 1743 style="fill:url(#linearGradient10272);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.37599999;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
1743 1744 d="M -1110.6807,28.14361 L -1110.6807,18.79986 C -1110.6806,12.991839 -1106.0198,8.33111 -1100.2119,8.33111 L -1002.6807,8.33111 C -996.87282,8.331111 -992.21189,12.991842 -992.21189,18.79986 L -992.21189,28.14361 L -1002.6807,28.14361 L -1100.2119,28.14361 L -1110.6807,28.14361 z"
1744 1745 id="path10033" />
  1746 + <path
  1747 + sodipodi:type="arc"
  1748 + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:2.07599998;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  1749 + id="path2643"
  1750 + sodipodi:cx="886.29395"
  1751 + sodipodi:cy="420.71524"
  1752 + sodipodi:rx="14.589674"
  1753 + sodipodi:ry="14.589674"
  1754 + d="M 900.88362,420.71524 A 14.589674,14.589674 0 1 1 871.70427,420.71524 A 14.589674,14.589674 0 1 1 900.88362,420.71524 z"
  1755 + transform="matrix(1.4338904,0,0,1.5153444,-1309.6953,-563.93823)" />
  1756 + <path
  1757 + transform="matrix(1.5234881,0,0,1.5777908,-1389.1053,-579.26642)"
  1758 + d="M 900.88362,420.71524 A 14.589674,14.589674 0 1 1 871.70427,420.71524 A 14.589674,14.589674 0 1 1 900.88362,420.71524 z"
  1759 + sodipodi:ry="14.589674"
  1760 + sodipodi:rx="14.589674"
  1761 + sodipodi:cy="420.71524"
  1762 + sodipodi:cx="886.29395"
  1763 + id="path2641"
  1764 + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#5c3566;stroke-width:2.07599998;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  1765 + sodipodi:type="arc" />
  1766 + <path
  1767 + sodipodi:type="arc"
  1768 + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:2.07599998;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  1769 + id="path2639"
  1770 + sodipodi:cx="886.29395"
  1771 + sodipodi:cy="420.71524"
  1772 + sodipodi:rx="14.589674"
  1773 + sodipodi:ry="14.589674"
  1774 + d="M 900.88362,420.71524 A 14.589674,14.589674 0 1 1 871.70427,420.71524 A 14.589674,14.589674 0 1 1 900.88362,420.71524 z"
  1775 + transform="matrix(1.4992278,0,0,1.4449252,-1372.8775,-528.64177)" />
  1776 + <path
  1777 + transform="matrix(1.3953173,0,0,1.3410147,-1270.2344,-484.92504)"
  1778 + d="M 900.88362,420.71524 A 14.589674,14.589674 0 1 1 871.70427,420.71524 A 14.589674,14.589674 0 1 1 900.88362,420.71524 z"
  1779 + sodipodi:ry="14.589674"
  1780 + sodipodi:rx="14.589674"
  1781 + sodipodi:cy="420.71524"
  1782 + sodipodi:cx="886.29395"
  1783 + id="path2637"
  1784 + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f57900;stroke-width:2.07599998;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  1785 + sodipodi:type="arc" />
  1786 + <path
  1787 + sodipodi:type="arc"
  1788 + style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:2.07599998;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  1789 + id="path2635"
  1790 + sodipodi:cx="886.29395"
  1791 + sodipodi:cy="420.71524"
  1792 + sodipodi:rx="14.589674"
  1793 + sodipodi:ry="14.589674"
  1794 + d="M 900.88362,420.71524 A 14.589674,14.589674 0 1 1 871.70427,420.71524 A 14.589674,14.589674 0 1 1 900.88362,420.71524 z"
  1795 + transform="matrix(1.2274929,0,0,1.2274929,-1126.7665,-437.16469)" />
  1796 + <g
  1797 + id="g2611"
  1798 + transform="matrix(7.4610672e-2,0,0,7.4610672e-2,-82.686883,89.658353)">
  1799 + <g
  1800 + transform="translate(-127.71426,-219.17851)"
  1801 + style="display:inline"
  1802 + id="g2613"
  1803 + inkscape:label="Water">
  1804 + <g
  1805 + style="display:inline"
  1806 + inkscape:label="Shape"
  1807 + id="g2615"
  1808 + inkscape:groupmode="layer">
  1809 + <path
  1810 + transform="translate(375.02778,-361.64819)"
  1811 + d="M 564.3755,441.46219 A 224.10817,224.10817 0 1 1 116.15916,441.46219 A 224.10817,224.10817 0 1 1 564.3755,441.46219 z"
  1812 + sodipodi:ry="224.10817"
  1813 + sodipodi:rx="224.10817"
  1814 + sodipodi:cy="441.46219"
  1815 + sodipodi:cx="340.26733"
  1816 + id="path2617"
  1817 + style="opacity:1;fill:url(#linearGradient2633);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  1818 + sodipodi:type="arc" />
  1819 + <path
  1820 + sodipodi:type="arc"
  1821 + style="opacity:1;fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  1822 + id="path2619"
  1823 + sodipodi:cx="340.26733"
  1824 + sodipodi:cy="441.46219"
  1825 + sodipodi:rx="224.10817"
  1826 + sodipodi:ry="224.10817"
  1827 + d="M 564.3755,441.46219 A 224.10817,224.10817 0 1 1 116.15916,441.46219 A 224.10817,224.10817 0 1 1 564.3755,441.46219 z"
  1828 + transform="translate(375.02778,-361.64819)" />
  1829 + </g>
  1830 + <g
  1831 + style="display:inline"
  1832 + inkscape:label="Highlights-Water"
  1833 + id="g2621"
  1834 + inkscape:groupmode="layer" />
  1835 + </g>
  1836 + <g
  1837 + transform="translate(235.75842,-582.65119)"
  1838 + style="display:inline"
  1839 + inkscape:label="Continents"
  1840 + id="g2623">
  1841 + <g
  1842 + style="display:inline"
  1843 + inkscape:label="Shapes"
  1844 + id="g2625"
  1845 + inkscape:groupmode="layer">
  1846 + <path
  1847 + sodipodi:nodetypes="cccccccccccccccccccccccccccccscccccccccsccsccccccccccc"
  1848 + id="path2627"
  1849 + d="M 370.97959,650.97443 L 384.35918,642.46014 L 377.98518,635.79375 L 395.91429,598.67239 C 394.7174,587.90476 395.731,578.08449 398.9551,568.26422 L 389.22449,562.18259 L 373.04964,559.74994 L 370.68722,546.9317 L 361.3192,539.38818 L 360.64082,529.29496 L 349.08571,519.003 L 350.93361,508.05606 L 359.78709,505.30762 L 349.08571,494.67647 L 359.42449,486.77035 L 367.93878,484.94586 L 360.34844,476.1626 L 372.19592,466.70096 C 374.27377,458.14766 377.29898,450.85751 382.2189,442.93578 L 381.92653,430.81933 L 386.13686,430.50354 L 390.70978,421.38109 L 400.77959,419.87239 L 415.98367,422.9132 L 415.66788,428.36327 L 431.11753,426.90138 L 450.64898,435.07647 L 458.5551,442.37443 L 471.32653,442.98259 C 478.37553,448.41683 483.03543,453.14048 483.37024,455.27688 C 483.71044,457.44768 486.80596,462.53829 492.61224,467.30912 L 489.57143,477.6479 L 498.08571,485.55402 L 507.20816,486.16218 L 511.46531,491.02749 L 522.41224,491.02749 L 523.62857,498.32545 L 532.14286,498.32545 L 532.14286,511.09688 C 516.29146,525.34183 511.46766,556.78856 503.53578,565.2 C 497.62802,571.46495 488.01208,574.18215 477.40816,576.77851 L 471.27972,591.39783 C 461.54514,599.86928 460.60389,604.74285 453.76002,610.49646 C 450.98634,612.82828 447.67839,613.82965 443.69022,615.02257 L 441.52653,607.18667 L 443.95918,603.53769 L 437.26939,607.18667 L 433.62041,615.09279 L 432.98884,621.10421 L 419.97185,629.95768 L 403.48121,632.12137 L 401.9491,638.76435 C 391.2788,643.17357 389.45048,646.63543 389.83265,649.14994 L 370.97959,650.97443 z"
  1850 + style="fill:#f4f6f9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
  1851 + <path
  1852 + sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
  1853 + id="path2629"
  1854 + d="M 341.67947,438.79176 C 338.52161,431.84448 328.08926,428.93373 322.73236,423.63407 L 320.83765,412.26581 C 313.89038,413.21316 307.89046,413.52895 300.94319,411.31845 C 300.20636,408.89743 299.46952,406.47642 298.73269,404.0554 L 286.73286,397.10812 L 279.15402,403.73961 C 262.31215,401.95016 263.78581,396.05551 244.73344,384.16094 L 243.78609,370.89796 C 240.31245,362.58229 237.78617,354.26662 230.52311,346.8983 L 230.8389,337.74053 L 225.78634,334.89846 L 225.78634,352.58243 L 233.36518,363.00333 L 233.68097,371.84532 C 223.04954,357.42447 219.99695,344.58254 219.78642,329.53012 C 215.70366,319.54883 216.31279,322.58284 216.31279,322.58284 L 216.62858,311.84615 C 219.89169,298.7937 224.10215,291.42538 236.83882,278.37294 C 238.83879,265.95205 247.47025,260.79423 252.94386,252.47855 C 265.15422,244.89971 289.99598,234.4788 317.04823,231.63674 L 359.995,229.11046 L 378.94211,235.42616 L 381.1526,243.63657 L 374.52111,239.21558 L 361.57393,238.58401 L 358.73186,233.53145 L 347.67938,234.16302 L 347.99517,239.21558 L 332.5217,239.53136 L 318.94294,245.84707 C 319.67977,252.47856 337.469,253.7417 347.67938,258.16269 L 354.31087,264.47839 L 352.41616,256.26797 L 356.83715,251.84698 L 353.04773,247.74178 L 352.10037,240.47872 C 363.99494,241.21555 374.94216,243.8471 377.36318,248.37335 L 386.20516,246.79442 C 395.04714,255.84693 403.57334,259.2153 414.62582,262.58368 C 415.99422,269.21517 419.25734,272.05723 424.41516,273.95194 L 417.78367,275.84665 L 411.15219,272.37301 L 410.52061,264.1626 L 403.57334,269.21516 L 391.57351,267.00467 L 385.57359,270.16252 L 395.36293,269.21516 L 401.04706,283.10971 L 387.15252,285.3202 L 382.73153,290.05698 L 383.99467,295.42533 L 379.57368,296.0569 L 375.46847,302.3726 L 371.04748,299.53053 L 366.62649,302.05681 L 370.10012,311.21458 C 363.25811,319.53025 349.78462,327.84593 346.73203,339.95102 L 353.99508,349.10879 L 353.36351,359.84548 L 348.62674,360.47705 L 343.25839,352.58243 L 342.94261,343.10887 L 327.46914,334.58268 C 318.83768,334.89846 313.04828,335.84582 307.25889,340.26681 L 293.36435,338.3721 L 278.20666,350.37193 L 281.99608,356.37185 L 276.94352,369.31904 L 281.6803,381.95044 L 289.57492,389.84507 L 304.41683,386.68722 L 314.83773,375.31895 L 320.83765,375.63474 L 320.20608,383.52937 L 314.52195,388.58193 L 314.52195,400.58176 L 333.15327,400.26598 C 333.8901,405.31854 337.78478,406.58168 340.10054,409.73953 L 337.57426,426.16035 L 343.25839,432.79184 L 341.67947,438.79176 z"
  1855 + style="fill:#f4f6f9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
  1856 + </g>
  1857 + <g
  1858 + style="display:inline"
  1859 + inkscape:label="Highlights"
  1860 + id="g2631"
  1861 + inkscape:groupmode="layer" />
  1862 + </g>
  1863 + </g>
1745 1864 </g>
1746 1865 </svg>
... ...
public/designs/templates/default/stylesheets/style.css
  Diff comments   View file @d75f3c8
... ... @@ -3,16 +3,34 @@ body {
3 3 font-size: 14px;
4 4 }
5 5  
6   -#wrap {
7   -background: url("../images/bg_content.png") top center repeat-y;
  6 +#wrap.category {
  7 + background-attachment: fixed;
  8 + background: url("../images/bgblue.jpg") top left no-repeat;
8 9 }
9 10  
10   -#frame {
11   -background: url("../images/bg_bgheader.png") top left repeat-x;
12   -}
  11 +#wrap.category1 {
  12 + background-attachment: fixed;
  13 + background: url("../images/bgorange.jpg") top left no-repeat;
  14 + }
  15 +
  16 +#wrap.category2 {
  17 + background-attachment: fixed;
  18 + background: url("../images/bggreen.jpg") top left no-repeat;
  19 + }
  20 +
  21 +#wrap.category3 {
  22 + background-attachment: fixed;
  23 + background: url("../images/bgpurple.jpg") top left no-repeat;
  24 + }
  25 +
  26 +#wrap.category4 {
  27 + background-attachment: fixed;
  28 + background: url("../images/bgred.jpg") top left no-repeat;
  29 + }
  30 +
  31 +
13 32  
14 33 #header {
15   -background: url("../images/bg_header.png") top center no-repeat;
16 34 height: 135px;
17 35 }
18 36  
... ... @@ -58,7 +76,6 @@ clear: both;
58 76 color: #333;
59 77 margin: 0px;
60 78 padding: 5px;
61   - background: #c5d0df url("../images/bg_footer.png") top left repeat-x;
62 79 }
63 80  
64 81  
... ... @@ -142,7 +159,6 @@ div#notice .button a {
142 159 color: black;
143 160 padding: 4px;
144 161 padding-left: 28px;
145   - background-image: url(../../../icons/default/cancel.png);
146 162 background-position: top left;
147 163 background-repeat: no-repeat;
148 164 }
... ...
public/designs/themes/macstyle/style.css
  Diff comments   View file @d75f3c8
... ... @@ -6,31 +6,29 @@ div.block
6 6 border: 0px;
7 7 }
8 8  
9   -div.block ul
  9 +ul.block_control_list
10 10 {
11 11 list-style: none;
12   - margin-left: 15px;
  12 + margin: 0px;
  13 + padding: 0px;
13 14 }
14 15  
15   -ul.block_list div.block h3 {
16   - cursor:move;
17   -}
18   -
19   -div.block h3
  16 +h3.block_header
20 17 {
21 18 background: url('images/h3bg.png') repeat-x;
  19 + cursor:move;
22 20 font-family: Sans-serif;
23 21 font-size: 15px;
24 22 margin: 0px;
25   - line-height: 25px;
  23 + padding: 0px;
26 24 overflow: hidden;
27   - vertical-align: middle;
28 25 color: #545454;
29 26 padding-left: 10px;
30   - height: 35px;
  27 + height: 25px;
  28 + vertical-align: top;
31 29 }
32 30  
33   -div.block span {
  31 +a.button_block span {
34 32 display: none;
35 33 padding: 1px;
36 34 color: #000;
... ... @@ -41,13 +39,13 @@ font-weight: normal;
41 39 border: 1px inset #545454;
42 40 }
43 41  
44   -div.block a:hover span {
  42 +a.button_block:hover span {
45 43 display: inline;
46 44 position: absolute;
47 45 margin-top: -20px;
48 46 }
49 47  
50   -div.block a {
  48 +a.button_block {
51 49 display: block;
52 50 float: right;
53 51 position: absolute;
... ...