Author: vjrj_ Date: 2011-10-05 14:53:57 +0200 (Wed, 05 Oct 2011) New Revision: 1545 Added: trunk/src/main/java/cc/kune/common/client/resources/clear.png trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.ui.xml trunk/src/main/webapp/others/defgroup.gif trunk/src/main/webapp/others/defgroup.png Modified: trunk/img/icons/from-private-to-public.svg trunk/img/webtemplate/web_home_template-2011.svg trunk/script/css-update.sh trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml trunk/src/main/webapp/ws.html Log: NEW - # 132: Global public stats http://kune.ourproject.org/issues/ticket/132 Modified: trunk/img/icons/from-private-to-public.svg =================================================================== --- trunk/img/icons/from-private-to-public.svg 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/img/icons/from-private-to-public.svg 2011-10-05 12:53:57 UTC (rev 1545) @@ -27,15 +27,15 @@ inkscape:pageshadow="2" inkscape:zoom="1.2968783" inkscape:cx="372.04724" - inkscape:cy="526.18109" + inkscape:cy="865.45734" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1080" - inkscape:window-height="1824" + inkscape:window-width="1078" + inkscape:window-height="897" inkscape:window-x="0" - inkscape:window-y="21" - inkscape:window-maximized="1" + inkscape:window-y="947" + inkscape:window-maximized="0" showguides="true" inkscape:guide-bbox="true" inkscape:snap-bbox="true" @@ -57,7 +57,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -721,5 +721,117 @@ id="tspan8835" x="24.299999" y="56.452183">1234</tspan></text> + <g + id="g3063" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/webapp/others/defgroup.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <g + id="g3047" + transform="matrix(0.9,0,0,0.9,246.64216,77.109544)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/grop-def-new.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:transform-center-x="2.1800737" + transform="matrix(4.71003,1.6779794,-1.6779794,4.71003,-33.10757,48.018455)" + inkscape:transform-center-y="-0.21689042" + d="m 35,17.362183 -4.755283,-3.454915 1.816357,-5.5901703 5.877852,-10e-8 1.816357,5.5901694 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.1991149" + sodipodi:arg1="1.5707963" + sodipodi:r2="4.045085" + sodipodi:r1="5" + sodipodi:cy="12.362183" + sodipodi:cx="35" + sodipodi:sides="5" + id="path3049" + style="color:#000000;fill:none;stroke:#28220b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:type="arc" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3051" + sodipodi:cx="90" + sodipodi:cy="32.362183" + sodipodi:rx="20" + sodipodi:ry="10" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + transform="matrix(2.375,0,0,4.7499998,-102.75,10.817397)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceEnabled.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:type="arc" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3053" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,45.524372,-53.39817)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,18.680548,-64.20388)" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path3055" + style="color:#000000;fill:#69312f;fill-opacity:1;stroke:#69312f;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:type="arc" + style="color:#000000;fill:#28220b;fill-opacity:1;stroke:#28220b;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3057" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,43.935022,-24.026857)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,16.336633,-16.494463)" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path3059" + style="color:#000000;fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:type="arc" + style="color:#000000;fill:#ffdb6b;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3061" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + transform="matrix(11.211448,3.9941526,-3.9941526,11.211448,-16.590722,-79.68006)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> + </g> </g> </svg> Modified: trunk/img/webtemplate/web_home_template-2011.svg =================================================================== --- trunk/img/webtemplate/web_home_template-2011.svg 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/img/webtemplate/web_home_template-2011.svg 2011-10-05 12:53:57 UTC (rev 1545) @@ -29,9 +29,9 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="546.88652" - inkscape:cy="140.60185" + inkscape:zoom="0.91276042" + inkscape:cx="512" + inkscape:cy="252.53067" inkscape:current-layer="layer1" inkscape:document-units="px" showgrid="false" @@ -440,7 +440,7 @@ id="flowSpan5635">communicate, share, collaborate with others and </flowSpan></flowSpan>create your web spaces easily. <flowSpan style="font-size:18px;fill:#803300" id="flowSpan5641">Join!</flowSpan></flowPara></flowRoot> <g - transform="translate(544.82096,-695.09755)" + transform="translate(554.68116,-707.1489)" id="g2737" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/logo-big-home.png" inkscape:export-xdpi="90" @@ -499,7 +499,7 @@ x="1473" y="534" /> <flowRoot - transform="translate(-102,209)" + transform="translate(-102.00001,229.81598)" style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" id="flowRoot4636" xml:space="preserve"><flowRegion @@ -512,20 +512,20 @@ id="rect4640" /></flowRegion><flowPara style="font-size:18px;font-weight:bold;text-align:start;text-anchor:start;fill:#c87137;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold" id="flowPara4642">Latests groups created</flowPara></flowRoot> <flowRoot - transform="translate(290,408)" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + transform="translate(-68,405.18005)" + style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" id="flowRoot4644" xml:space="preserve"><flowRegion id="flowRegion4646"><rect - style="text-align:justify;text-anchor:start;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="font-size:14px;text-align:end;text-anchor:end;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" y="329.61539" x="286.03818" height="187.65573" width="666.18433" id="rect4648" /></flowRegion><flowPara - style="font-size:20px;font-weight:bold;text-align:justify;text-anchor:start;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;-inkscape-font-specification:Ubuntu Bold" + style="font-size:14px;font-weight:bold;text-align:end;text-anchor:end;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;-inkscape-font-specification:Ubuntu Bold" id="flowPara4650">(©) cc-by-sa kune.beta.ieapala.es </flowPara></flowRoot> <flowRoot - transform="translate(-102.234,241)" + transform="translate(-102.23401,261.81598)" style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" id="flowRoot4654" xml:space="preserve"><flowRegion @@ -1080,7 +1080,7 @@ xml:space="preserve" id="flowRoot14561" style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - transform="translate(-102,294)"><flowRegion + transform="translate(-98.713267,335.12435)"><flowRegion id="flowRegion14563"><rect id="rect14565" width="331.18436" @@ -1093,7 +1093,7 @@ xml:space="preserve" id="flowRoot14569" style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - transform="translate(-101.478,321)"><flowRegion + transform="translate(-98.191267,362.12435)"><flowRegion id="flowRegion14571"><rect id="rect14573" width="666.18433" @@ -1103,7 +1103,7 @@ style="font-size:18px;text-align:justify;text-anchor:start;fill:#8a5050;fill-opacity:1" /></flowRegion><flowPara id="flowPara14575">group1 / Some project about bla bla bla</flowPara><flowPara id="flowPara14577">group2 / Other project</flowPara></flowRoot> <flowRoot - transform="translate(-102,379)" + transform="translate(-98.713267,420.12435)" style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.85;color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" id="flowRoot14579" xml:space="preserve"><flowRegion @@ -1116,7 +1116,7 @@ id="rect14583" /></flowRegion><flowPara style="font-size:18px;font-weight:bold;text-align:start;text-anchor:start;fill:#c87137;fill-opacity:1;-inkscape-font-specification:Ubuntu Bold" id="flowPara14585">Latests activity in your groups</flowPara></flowRoot> <flowRoot - transform="translate(-101.478,406)" + transform="translate(-98.191267,447.12435)" style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:justify;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.85;color:#000000;fill:#8a5050;fill-opacity:1;fill-rule:nonzero;stroke:#cf5c43;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" id="flowRoot14587" xml:space="preserve"><flowRegion @@ -1193,6 +1193,42 @@ y="247.90636" rx="3.7326424" ry="2.6603734" /> + <rect + ry="1.4876868" + rx="3.7326424" + y="167.90636" + x="158" + height="81.306496" + width="725" + id="rect14623" + style="color:#000000;fill:none;stroke:#e6e6e6;stroke-width:0.88812524;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect14625" + width="15" + height="15" + x="185.15265" + y="528.40656" + rx="4.6459203" + ry="1.5668095" /> + <rect + ry="1.5668095" + rx="4.6459203" + y="528.40656" + x="205.15265" + height="15" + width="15" + id="rect15395" + style="color:#000000;fill:#ffb380;fill-opacity:1;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#ffb380;fill-opacity:1;stroke:none;stroke-width:1.40678155;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect15397" + width="15" + height="15" + x="225.15265" + y="528.40656" + rx="4.6459203" + ry="1.5668095" /> </g> <g inkscape:groupmode="layer" Modified: trunk/script/css-update.sh =================================================================== --- trunk/script/css-update.sh 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/script/css-update.sh 2011-10-05 12:53:57 UTC (rev 1545) @@ -16,7 +16,7 @@ cp src/main/java/cc/kune/msgs/public/kune-message.css target/kune-$VERSION/ws/ cp src/main/java/cc/kune/common/public/kune-common.css target/kune-$VERSION/ws/ cp src/main/java/cc/kune/core/public/ws.css target/kune-$VERSION/ws/ -cp src/main/java/cc/kune/core/public/ws.html target/kune-$VERSION/ws/ +#cp src/main/java/cc/kune/core/public/ws.html target/kune-$VERSION/ #cp src/main/webapp/templates/basic/basic.css target/kune-$VERSION/templates/basic/basic.css #cp src/main/webapp/templates/basic/docs.liquid.html target/kune-$VERSION/templates/basic/ cp src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css target/kune-$VERSION/ws/gxt-custom/css/gxt-op-common.css Modified: trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -30,6 +30,9 @@ @Source("checked.png") ImageResource checked(); + @Source("clear.png") + ImageResource clear(); + @Source("kune-close.png") ImageResource kuneClose(); Added: trunk/src/main/java/cc/kune/common/client/resources/clear.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/client/resources/clear.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/DottedTab.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -0,0 +1,19 @@ +package cc.kune.common.client.ui; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Widget; + +public class DottedTab extends Composite { + + interface DottedTabUiBinder extends UiBinder<Widget, DottedTab> { + } + + private static DottedTabUiBinder uiBinder = GWT.create(DottedTabUiBinder.class); + + public DottedTab() { + initWidget(uiBinder.createAndBindUi(this)); + } + +} Added: trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/DottedTab.ui.xml 2011-10-05 12:53:57 UTC (rev 1545) @@ -0,0 +1,11 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:with field='res' + type='cc.kune.common.client.resources.CommonIconResources'/> + <ui:style> + + </ui:style> + <g:Image ui:field="image" stylePrimaryName="k-dottedtab" + width="15px" height="15px" resource='{res.clear}'/> + </ui:UiBinder> \ No newline at end of file Added: trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -0,0 +1,29 @@ +package cc.kune.common.client.ui; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.TabLayoutPanel; +import com.google.gwt.user.client.ui.Widget; + +public class DottedTabPanel extends Composite { + + interface DottedTabPanelUiBinder extends UiBinder<Widget, DottedTabPanel> { + } + + private static DottedTabPanelUiBinder uiBinder = GWT.create(DottedTabPanelUiBinder.class); + + @UiField + TabLayoutPanel tabPanel; + + public DottedTabPanel(final String width, final String height) { + initWidget(uiBinder.createAndBindUi(this)); + tabPanel.setSize(width, height); + } + + public void addTab(final IsWidget view) { + tabPanel.add(view, new DottedTab()); + } +} Added: trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/common/client/ui/DottedTabPanel.ui.xml 2011-10-05 12:53:57 UTC (rev 1545) @@ -0,0 +1,8 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:style> + </ui:style> + <g:TabLayoutPanel stylePrimaryName="k-dotted-tabpanel" + ui:field="tabPanel" barUnit="PX" barHeight="17"/> +</ui:UiBinder> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -135,7 +135,7 @@ } public void setLeftIcon(final String imgCss) { - iconLeft.setUrl("images/clear.gif"); + iconLeft.setUrl(GWT.getModuleBaseURL() + "images/clear.gif"); iconLeft.setStyleName(imgCss); iconLeft.addStyleName("k-iconlabel-left"); iconLeft.addStyleName("oc-ico-pad"); Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -222,7 +222,7 @@ return kuneConstants.getString(I18nUtils.convertMethodName(text + " " + noteForTranslators)); } catch (final MissingResourceException e) { if (lexicon == null) { - Log.warn("i18n not initialized"); + Log.warn("i18n not initialized: " + text); return text; } String translation = lexicon.get(encodeText); Modified: trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/core/client/init/PrefetchUtilities.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -19,6 +19,8 @@ */ package cc.kune.core.client.init; +import cc.kune.core.shared.FileConstants; + import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.RepeatingCommand; import com.google.gwt.user.client.ui.Image; @@ -45,13 +47,13 @@ while (i < lic.length) { final String licImg = lic[i]; - Image.prefetch("images/lic/" + licImg); + Image.prefetch(FileConstants.ASITE_PREFIX + "images/lic/" + licImg); i++; } while (j < ext.length) { final String extImg = ext[j]; - Image.prefetch("gxt/images/" + extImg); + Image.prefetch(FileConstants.ASITE_PREFIX + "gxt/images/" + extImg); j++; } @@ -72,7 +74,7 @@ final String[] imgs = { "images/corner.png", "images/hborder.png" }; for (final String img : imgs) { - Image.prefetch(img); + Image.prefetch(FileConstants.ASITE_PREFIX + img); } } } Modified: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityTextLogo.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -20,6 +20,7 @@ package cc.kune.core.client.ws.entheader; import cc.kune.core.client.avatar.MediumAvatarDecorator; +import cc.kune.core.shared.FileConstants; import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.HorizontalPanel; @@ -97,7 +98,7 @@ } public void setLogoImage(final String url) { - logoImage.setUrl("images/clear.gif"); + logoImage.setUrl(FileConstants.ASITE_PREFIX + "images/clear.gif"); Image.prefetch(url); logoImage.setUrl(url); } Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-10-05 12:53:57 UTC (rev 1545) @@ -1,4 +1,4 @@ -GCHARSET "UTF-8 "; body { +GCHARSET "UTF-8 "; body { background-color: transparent; color: black; font-family: 'Ubuntu', Arial; @@ -944,7 +944,7 @@ border-color: #CCCCCC !important; background: inherits !important; kfilter: alpha(opacity = - 60) !important; + 60) !important; -moz-opacity: 0.60 !important; -khtml-opacity: 0.60 !important; opacity: 0.60 !important; @@ -1230,7 +1230,7 @@ -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; kfilter: alpha(opacity = - 90); + 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -1531,4 +1531,18 @@ div.jGrowl div.jGrowl-notification div.header { background-color: #000000 !important; padding: 0 !important; +} + +/* Dotted tab panel */ +.k-dotted-tabpanel .gwt-TabLayoutPanelTab { + background-color: #ffccaa; + -webkit-border-radius: 0px !important; + -moz-border-radius: 0px !important; + border-radius: 0px !important; + margin: 0 2px; + cursor: pointer; +} + +.k-dotted-tabpanel .gwt-TabLayoutPanelTab-selected { + background-color: #dd8a3d; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/core/server/manager/file/EntityLogoDownloadManager.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import cc.kune.core.server.manager.GroupManager; import cc.kune.core.shared.FileConstants; import cc.kune.core.shared.domain.utils.StateToken; @@ -37,37 +36,40 @@ public class EntityLogoDownloadManager extends HttpServlet { - private static final long serialVersionUID = -1958945058088446881L; - @Inject - GroupManager groupManager; + private static final long serialVersionUID = -1958945058088446881L; + @Inject + GroupManager groupManager; - @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, - IOException { + @Override + protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) + throws ServletException, IOException { - // final String userHash = req.getParameter(FileParams.HASH); - final StateToken stateToken = new StateToken(req.getParameter(FileConstants.TOKEN)); + // final String userHash = req.getParameter(FileParams.HASH); + final StateToken stateToken = new StateToken(req.getParameter(FileConstants.TOKEN)); - Group group = Group.NO_GROUP; - try { - group = groupManager.findByShortName(stateToken.getGroup()); - if (group == Group.NO_GROUP) { - throw new NoResultException("Group not found trying to get the logo"); - } + Group group = Group.NO_GROUP; + try { + group = groupManager.findByShortName(stateToken.getGroup()); + if (group == Group.NO_GROUP) { + throw new NoResultException("Group not found trying to get the logo"); + } - if (!group.hasLogo()) { - throw new NoResultException("This Group has no logo"); - } - } catch (NoResultException e) { - FileDownloadManagerUtils.returnNotFound(resp); - return; - } + if (!group.hasLogo()) { + FileDownloadManagerUtils.returnFile("src/main/webapp/others/defgroup.gif", + resp.getOutputStream()); + } else { + // Has logo + final byte[] logo = group.getLogo(); - byte[] logo = group.getLogo(); - resp.setContentLength(logo.length); resp.setContentType(group.getLogoMime().toString()); - resp.setHeader("Content-Disposition", "attachment; filename=\"" + group.getShortName() + "-logo\""); + resp.setHeader("Content-Disposition", "attachment; filename=\"" + group.getShortName() + + "-logo\""); resp.getOutputStream().write(logo); + } + } catch (final NoResultException e) { + FileDownloadManagerUtils.returnNotFound(resp); + return; } + } } Modified: trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -11,7 +11,7 @@ public class StatsServiceDefault implements StatsService { - private static final int LIMIT = 20; + private static final int LIMIT = 6; private final ContentFinder contentFinder; private final GroupFinder groupFinder; private final UserFinder userFinder; Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -28,6 +28,7 @@ AdmissionType admissionType; private String backgroundImage; + private Long createdOn; private ContentSimpleDTO defaultContent; private LicenseDTO defaultLicense; private GroupType groupType; @@ -78,6 +79,10 @@ return backgroundImage; } + public Long getCreatedOn() { + return createdOn; + } + public ContentSimpleDTO getDefaultContent() { return defaultContent; } @@ -145,6 +150,10 @@ this.backgroundImage = backgroundImage; } + public void setCreatedOn(final Long createdOn) { + this.createdOn = createdOn; + } + public void setDefaultContent(final ContentSimpleDTO defaultContent) { this.defaultContent = defaultContent; } Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java =================================================================== --- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.java 2011-10-05 12:53:57 UTC (rev 1545) @@ -2,6 +2,9 @@ import java.util.List; +import org.waveprotocol.wave.client.common.util.DateUtils; + +import cc.kune.common.client.ui.DottedTabPanel; import cc.kune.core.client.services.FileDownloadUtils; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.ContentSimpleDTO; @@ -44,21 +47,25 @@ public InlineLabel globalStatsTotalUsersCount; @UiField public InlineLabel globalStatsTotalUsersTitle; - @UiField - FlowPanel groupStats; private final RootPanel groupStatsParent; @UiField public FlowPanel lastActivityInYourGroup; @UiField public Label lastActivityInYourGroupTitle; @UiField + FlowPanel lastActivityPanel; + @UiField public FlowPanel lastGroups; @UiField + FlowPanel lastGroupsPanel; + @UiField public Label lastGroupsTitle; @UiField public FlowPanel lastPublishedContents; @UiField public Label lastPublishedContentsTitle; + @UiField + FlowPanel lastPublishedPanel; private final Provider<GroupContentHomeLink> linkProv; @@ -73,15 +80,19 @@ globalStatsTitle.setText(i18n.t("Stats")); globalStatsTotalGroupsTitle.setText(i18n.t("Hosted groups:")); globalStatsTotalUsersTitle.setText(i18n.t("Registered users:")); - lastActivityInYourGroupTitle.setText(i18n.t("Latest created groups")); - lastGroupsTitle.setText(i18n.t("Latest publications")); - lastPublishedContentsTitle.setText(i18n.t("Latest activity in your groups")); + lastGroupsTitle.setText(i18n.t("Latest created groups")); + lastPublishedContentsTitle.setText(i18n.t("Latest publications")); + lastActivityInYourGroupTitle.setText(i18n.t("Latest activity in your groups")); + final DottedTabPanel tabPanel = new DottedTabPanel("465px", "200px"); + tabPanel.addTab(lastGroupsPanel); + // tabPanel.addTab(lastActivityPanel); + tabPanel.addTab(lastPublishedPanel); globalStats.removeFromParent(); - groupStats.removeFromParent(); + // groupStats.removeFromParent(); globalStatsParent = RootPanel.get("k-home-global-stats"); globalStatsParent.add(globalStats); groupStatsParent = RootPanel.get("k-home-group-stats"); - groupStatsParent.add(groupStats); + groupStatsParent.add(tabPanel); armor.getHomeSpace().add(RootPanel.get("k-home-wrapper")); } @@ -90,6 +101,11 @@ return widget; } + private String format(final Long modifiedOn, final String name) { + final String modOn = DateUtils.getInstance().formatPastDate(modifiedOn); + return modOn + " ~ " + name; + } + @Override public HasText getGlobalStatsTotalGroupsCount() { return globalStatsTotalGroupsCount; @@ -107,7 +123,7 @@ final GroupContentHomeLink link = linkProv.get(); final StateToken token = content.getStateToken(); link.setValues(downUtils.getLogoImageUrl(token.copy().clearDocument().clearFolder()), - content.getName(), token.toString()); + format(content.getModifiedOn(), content.getName()), token.toString()); lastActivityInYourGroup.add(link); } } @@ -117,8 +133,8 @@ lastGroups.clear(); for (final GroupDTO group : lastGroupsList) { final GroupContentHomeLink link = linkProv.get(); - link.setValues(downUtils.getLogoImageUrl(group.getStateToken()), group.getLongName(), - group.getShortName()); + link.setValues(downUtils.getLogoImageUrl(group.getStateToken()), + format(group.getCreatedOn(), group.getLongName()), group.getShortName()); lastGroups.add(link); } } @@ -130,7 +146,7 @@ final GroupContentHomeLink link = linkProv.get(); final StateToken token = content.getStateToken(); link.setValues(downUtils.getLogoImageUrl(token.copy().clearDocument().clearFolder()), - content.getName(), token.toString()); + format(content.getModifiedOn(), content.getName()), token.toString()); lastPublishedContents.add(link); } } @@ -143,7 +159,9 @@ @Override public void setUserGroupsActivityVisible(final boolean logged) { - lastActivityInYourGroup.setVisible(logged); + if (logged) { + lastActivityInYourGroup.setVisible(logged); + } lastActivityInYourGroupTitle.setVisible(logged); } Modified: trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/java/cc/kune/hspace/client/HSpacePanel.ui.xml 2011-10-05 12:53:57 UTC (rev 1545) @@ -2,7 +2,9 @@ <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"> <ui:style> -.padl { padding-left: 5px; } + .padl { + padding-left: 5px; + } </ui:style> <g:FlowPanel> <g:FlowPanel ui:field="globalStats"> @@ -20,14 +22,20 @@ addStyleNames="{style.padl} k-home-em-text"/> </g:FlowPanel> </g:FlowPanel> - <g:FlowPanel ui:field="groupStats"> + <g:FlowPanel ui:field="lastGroupsPanel"> <g:Label ui:field="lastGroupsTitle" styleName="k-home-title"/> <g:FlowPanel ui:field="lastGroups" styleName="k-home-normal-text"/> + </g:FlowPanel> + <g:FlowPanel ui:field="lastPublishedPanel"> <g:Label ui:field="lastPublishedContentsTitle" styleName="k-home-title"/> - <g:FlowPanel ui:field="lastPublishedContents" styleName="k-home-normal-text"/> + <g:FlowPanel ui:field="lastPublishedContents" + styleName="k-home-normal-text"/> + </g:FlowPanel> + <g:FlowPanel ui:field="lastActivityPanel"> <g:Label ui:field="lastActivityInYourGroupTitle" styleName="k-home-title"/> - <g:FlowPanel ui:field="lastActivityInYourGroup" styleName="k-home-normal-text"/> + <g:FlowPanel ui:field="lastActivityInYourGroup" + styleName="k-home-normal-text"/> </g:FlowPanel> </g:FlowPanel> </ui:UiBinder> \ No newline at end of file Added: trunk/src/main/webapp/others/defgroup.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/others/defgroup.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/others/defgroup.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/others/defgroup.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2011-10-05 01:42:19 UTC (rev 1544) +++ trunk/src/main/webapp/ws.html 2011-10-05 12:53:57 UTC (rev 1545) @@ -116,13 +116,12 @@ min-width: 320px; } -#k-home-ini { - clear: both; +#k-home-ini { /* clear: both; */ font-size: 20px; color: #69312f; text-align: justify; - padding: 27px 0; - line-height: 1.3em; + /* padding: 27px 0; */ + /* line-height: 1.3em; */ } #k-home-ini a { @@ -135,13 +134,18 @@ } #k-home-table { - display: table; + display: block; } -.k-home-header { +#k-home-header { display: table-row; + float: right; } +#k-home-intro { + display: table-row; +} + #k-home-footer { display: table-row; font-size: 14px; @@ -150,18 +154,14 @@ } #k-home-logo { - display: table-cell; margin: 50px 0 22px 0; - float: right; } #k-home-summary { - display: table-cell; font-size: 28px; color: #dd8a3d; font-weight: bold; white-space: nowrap; - float: left; } #k-home-summary li { @@ -171,19 +171,35 @@ line-height: 45px; } -#k-home-row { /* display: table-row;*/ +#k-home-body { /* display: table-row;*/ + clear: both; + display: block; +} +#k-home-left,#k-home-summary-left { + display: table-cell; } #k-home-left { + float: left; +} + +#k-home-right,#k-home-summary-right { display: table-cell; + text-align: right; + padding-left: 20px; } +#k-home-summary-right { + padding-top: 42px; + vertical-align: bottom; +} + #k-home-right { - display: table-cell; - text-align: right; white-space: nowrap; - padding-left: 30px; + vertical-align: top; + padding-top: 20px; + float: right; } #k-home-group-stats { @@ -196,15 +212,15 @@ .k-home-title { color: #c87137; - font-size: 19px; + font-size: 18px; font-weight: bold; padding-top: 10px; - clear: both; + /* clear: both; */ } .k-home-normal-text { color: #8a5050; - font-size: 18px; + font-size: 16px; } .k-home-em-text { @@ -228,7 +244,7 @@ .k-home-group-stats-item { clear: both; - line-height: 1.2em; + /* line-height: 1.2em; */ } .banner { @@ -269,32 +285,32 @@ </div> <div id="k-home-prewrap"> <div id="k-home-wrapper"> + <!-- This id is required for kune (you can create a different .html but preserve this id) --> <div id="k-home-table"> - <div class="k-home-header"> - <div id="k-home-logo"> - <img src="ws/logo-big-home.png" alt="" /> - </div> - </div> + <div id="k-home-header"></div> <!-- div home-header --> - <div class="k-home-header"> - <div id="k-home-summary"> - <ul> - <li - style="background-image: url(ws/images/kune-intro-user.png);">Comunicate - with others</li> - <li - style="background-image: url(ws/images/kune-intro-group.png);">Work - in collaboration</li> - <li - style="background-image: url(ws/images/kune-intro-world.png);">And - share with the world</li> - </ul> + <div id="k-home-intro"> + <div id="k-home-summary-left"> + <div id="k-home-logo"> + <img src="ws/logo-big-home.png" alt="" /> + </div> + <div id="k-home-summary"> + <ul> + <li + style="background-image: url(ws/images/kune-intro-user.png);">Comunicate + with others</li> + <li + style="background-image: url(ws/images/kune-intro-group.png);">Work + in collaboration</li> + <li + style="background-image: url(ws/images/kune-intro-world.png);">And + share with the world</li> + </ul> + </div> + <!-- k-home-summary --> </div> - <!-- k-home-summary --> - </div> - <!-- div home-header --> - <div id="k-home-row"> - <div id="k-home-left"> + <!-- k-home-summary-left --> + <div id="k-home-summary-right"> <div id="k-home-ini"> Welcome! This site is a Kune node. Kune, which means "together" in esperanto, it's a network of interconnected @@ -303,18 +319,28 @@ spaces easily</strong>. <a href="#signin">Join!</a> </div> <!-- div home-ini --> - <div id="k-home-group-stats" style="display: none;"></div> - <!-- div home-stats --> + <!-- k-home-summary-right --> </div> + <!-- div home-header --> + </div> + <div id="k-home-body"> + <div id="k-home-left"> + <div id="k-home-group-stats" style="display: none;"> + <!-- This id is required for kune (you can create a different .html but preserve this id) --> + </div> + <!-- div home-group-stats --> + </div> <!-- div k-home-left --> <div id="k-home-right"> <div id="k-home-global-stats" style="display: none;"> + <!-- This id is required for kune (you can create a different .html but preserve this id) --> </div> </div> <!-- div k-home-right --> </div> - <!-- div k-home-row --> - <div id="k-home-footer" style="display: none;"></div> + <!-- div k-home-body --> + <!-- <div id="k-home-footer" style="display: none;"> --> + <!-- </div> --> <!-- div k-home-footer --> </div> <!-- div home-table -->