[pLog-svn] r4450 - in plog/trunk: styles templates/summary

oscar at devel.lifetype.net oscar at devel.lifetype.net
Fri Dec 29 14:44:41 GMT 2006


Author: oscar
Date: 2006-12-29 14:44:40 +0000 (Fri, 29 Dec 2006)
New Revision: 4450

Modified:
   plog/trunk/styles/summary.css
   plog/trunk/templates/summary/agreement.template
   plog/trunk/templates/summary/blog.template
   plog/trunk/templates/summary/blogslist.template
   plog/trunk/templates/summary/faq.template
   plog/trunk/templates/summary/footer.template
   plog/trunk/templates/summary/header.template
   plog/trunk/templates/summary/index.template
   plog/trunk/templates/summary/message.template
   plog/trunk/templates/summary/post.template
   plog/trunk/templates/summary/postslist.template
   plog/trunk/templates/summary/recent.template
   plog/trunk/templates/summary/registerstep0.template
   plog/trunk/templates/summary/registerstep1.template
   plog/trunk/templates/summary/registerstep2.template
   plog/trunk/templates/summary/registerstep3.template
   plog/trunk/templates/summary/registerstep4.template
   plog/trunk/templates/summary/registerstep5.template
   plog/trunk/templates/summary/resource.template
   plog/trunk/templates/summary/searchresults.template
   plog/trunk/templates/summary/userlist.template
Log:
Improved design for the summary page based on Elena's design for bloc.balearweb.net with some colours and icons replaced. The templates still have some texts hardcoded in Catalan and they still need polishing, but I'm committing what I've done so far just in case so that you can have a look at it if interested.


Modified: plog/trunk/styles/summary.css
===================================================================
--- plog/trunk/styles/summary.css	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/styles/summary.css	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,817 +1,445 @@
-html, body {
-    font-family: verdana, tahoma, sans-serif;
-    font-size        : 0.90em;
-    margin           : 0px;
-    padding          : 0px;
-    text-align       : center;
-    font             : 12px verdana, tahoma, arial, sans-serif;
-    background       : #EEEEEE url("../imgs/bg_main.jpg") repeat-y center;   
-}
-
-#content a
-{
-    color            : #32609B;
-    font-family      : verdana, arial, tahoma, sans-serif;
-    text-decoration  : underline;
-}
-
-#content a:hover
-{
-    color            : #FFFFFF;
-    background-color : #818181;
-    font-family      : verdana, arial, tahoma, sans-serif;
-    text-decoration  : underline;
-}
-
-/* -------------------------------------------------------------- */
-/* Common stuff and basic page layout                             */
-/* -------------------------------------------------------------- */
-
-
-#container
-{
-    width            : 786px;
-    text-align       : left;
-    margin-left      : auto;
-    margin-right     : auto;
-}
-
-#header
-{
-    height           : 60px;
-    width            : 100%;
-    background       : #FFFFFF url("../imgs/top_admin.png") no-repeat right;
-    padding          : 0px;
-    margin           : 0px;
-}
-
-#header span
-{
-    display          : none;
-}
-
-#header h1
-{
-    margin           : 0;
-}
-
-#content
-{
-    position         : relative;
-    width            : 100%;
-    display          : block;
-    margin           : 0;
-    padding          : 0;
-}
-
-#dashboard
-{
-    padding-left     : 1em;
-    padding-right    : 1em;
-}
-
-.clr
-{
-    clear            : both;
-}
-
-/*-- Accessibility Tweaks --*/
-#skipNav
-{
-    position         : absolute;
-    left             : -9999px;
-    font-size        : small;
-}
-
-#skipNav a:focus
-{
-    display          : block;
-    position         : absolute;
-    top              : 20px;
-    left             : 10020px;
-    font-size        : large;
-    background       : #fff;
-    border           : solid 2px #1B6BD8;
-    padding          : 10px;
-    width            : 15em;
-    z-index          : 1;
-}
-
-#skipNav a:hover
-{
-    color            : #029EDE;
-}
-
-#skipNav a:active
-{
-    display          : block;
-    position         : absolute;
-    top              : 20px;
-    left             : 10020px;
-    font-size        : large;
-    background       : #fff;
-    border           : solid 2px #1B6BD8;
-    padding          : 10px;
-    width            : 15em;
-    z-index          : 1;
-}
-
-.hide
-{
-    display          : none;
-}
-
-/* -------------------------------------------------------------- */
-/* Navigation/menu bar                                            */
-/* -------------------------------------------------------------- */
-
-#menubar
-{
-    margin-bottom    : 10px;
-    background       : #FFFFFF url("../imgs/bg_menu.jpg") repeat-x;
-    height           : 20px;
-    /*border-bottom    : 1px solid #B4B4B4;*/
-}
-
-#menu
-{
-    padding-top      : 1px;
-    padding-bottom   : 1px;
-}
-
-#menu ul
-{
-    padding         : .2em 0;
-    margin          : 0;
-    list-style-type : none;
-    color           : #FFF;
-    width           : 100%;
-    text-align      : center;
-}
-
-#menu li
-{
-
-    position         : relative;
-    padding          : 0;
-    border-left      : 0px solid #B4B4B4;
-    display          : inline;
-    font-weight      : bold;
-    font-family      : verdana, tahoma, sans-serif;
-    font-size        : 0.83em;
-    letter-spacing   : 0.20em;
-    text-transform   : uppercase;
-}
-
-#menu a, #menu a:link, #menu a:visited
-{
-    padding          : .2em 1em;
-    color            : #0E3862;
-    text-decoration  : none;
-}
-
-#menu a:hover
-{
-    background       : #818181;
-    color            : #FFFFFF;
-}
-
-#menu li.selected
-{
-    display          : block;
-    width            : auto;
-    padding          : 2px 7px;
-    background       : #FFFFFF;
-    color            : #000000;
-    border-bottom    : 1px solid #FFFFFF;
-}
-
-#menu br
-{
-    clear: both;
-}
-
-/* -------------------------------------------------------------- */
-/* Section title and navigation history bar                       */
-/* -------------------------------------------------------------- */
-
-#nav_bar
-{
-    margin-left      : auto;
-    margin-right     : auto;
-    width            : 100%;
-    margin-bottom    : 15px;
-    border-bottom    : 1px dotted #DEDEDE;
-}
-
-#section_title
-{
-    float            : left;
-    width            : 39%;
-}
-
-#section_title h2
-{
-    color            : #588BCA;
-    font-weight      : bold;
-    font-family      : trebuchet ms, tahoma, sans-serif;
-    font-size        : 1.5em;
-    letter-spacing   : 0.08em;
-    margin           : 0;
-    padding-left     : 4px;
-}
-
-#navigation
-{
-    float            : right;
-    width            : 60%;
-    text-align       : right;
-    padding-top      : 7px;
-    font-family      : verdana, tahoma, sans-serif;
-    font-size        : 0.85em;
-    letter-spacing   : 0.09em;
-    padding-right    : 2px;
-}
-
-#navigation a
-{
-    color            : #000000;
-    text-decoration  : none;
-}
-
-#navigation a:hover
-{
-    color            : #5583BE;
-    text-decoration  : none;
-}
-
-/* -------------------------------------------------------------- */
-/* Admin Tabbed Ul's                                              */
-/* -------------------------------------------------------------- */
-
-#tablist
-{
-    padding          : 3px 0;
-    margin-left      : 0;
-    font             : 11px trebuchet ms, verdana, tahoma, arial, sans-serif;
-    border-bottom    : 1px solid #DEDEDE;
-}
-
-#tablist li
-{
-    list-style       : none;
-    margin           : 0;
-    display          : inline;
-}
-
-#tablist li a
-{
-    padding          : 3px 0.5em;
-    margin-left      : 3px;
-    border           : 1px solid #DEDEDE;
-    background       : #F4F4FF;
-    text-decoration  : none;
-}
-
-#tablist li a:link
-{
-    color            : #448;
-}
-
-#tablist li a:visited
-{
-    color            : #667;
-}
-
-#tablist li a:hover
-{
-    color            : #000;
-    background       : #F2F0FE;
-    border-color     : #DEDEDE;
-}
-
-#tablist li a#tab_current
-{
-    background       : white;
-    border-bottom    : 1px solid white;
-}
-
-/*.menuTop_level1 ul, li
-{
-    list-style-type: none;
-}
-
-.menuTop_level1 ul
-{
-  list-style-type: disc;
-  list-style-image: url(../imgs/bullet.gif);
-}
-*/
-
-/* -------------------------------------------------------------- */
-/* Form controls (input, ...)                                     */
-/* -------------------------------------------------------------- */
-
-form
-{
-    margin           : 0px;
-}
-
-fieldset
-{
-    border           : 1px solid #DEDEDE;
-    color            : #000000;
-    font-family      : verdana, tahoma, sans-serif;
-    font-size        : 0.90em;
-    padding-bottom   : 0px;
-    margin           : 0px;
-}
-
-textarea, input, select
-{
-    background       : #FFFFFF;
-    border           : 1px solid #b2b2b2;
-    color            : #000000;
-    font-family      : verdana, tahoma, sans-serif;
-    font-size        : 0.95em;
-}
-
-input:focus, textarea:focus, label:focus
-{
-    border           : 1px solid #5583BE;
-}
-
-.checkbox, .radio
-{
-    border           : 0px;
-}
-
-.submit
-{
-    /*margin-left      : 4px;*/
-}
-
-.list_action_button a img
-{
-    border           : 0px;
-    padding          : 0px;
-}
-
-.list_action_button a:hover img
-{
-/*    filter            : alpha(opacity=60);
-    opacity           : 0.6; */
-}
-
-.field
-{
-    top              : 0;
-    left             : 0;
-    margin           : 0 1em 1em 0;
-}
-
-.field .field
-{
-    margin           : 1em 0 0 0;
-}
-
-.field label
-{
-    font-size        : 100%;
-    font-weight      : bold;
-}
-
-.field_checkbox
-{
-    top              : 0;
-    left             : 0;
-}
-
-.field_checkbox label
-{
-    font-size        : 100%;
-}
-
-.formHelp
-{
-    font-size        : 90%;
-    color            : #76797c;
-    margin           : 0 0 0.2em 0;
-}
-
-.formHelp a
-{
-    text-decoration  : underline;
-}
-
-.formHelp:hover
-{
-    color            : Black;
-    cursor           : default;
-}
-
-fieldset
-{
-    border           : 1px solid #8cacbb;
-    margin           : 1em 0em 1em 0em;
-    padding          : 0em 1em 1em 1em;
-    line-height      : 1.5em;
-    width            : auto;
-}
-
-.inputField
-{
-    width: 85%;
-    margin-left: auto;
-    margin-right: auto;
-    background-color: #FCFCFF;
-    border: 1px solid #DEDEDE;
-}
-
-.buttons
-{
-    width: 88%;
-    margin-left: auto;
-    margin-right: auto;
-    text-align: right;
-}
-
-.inputField input
-{
-    width:100%;
-}
-
-.inputField legend
-{
-    font-weight: bold;
-}
-
-.inputField .dateTime
-{
-   width: 80%;
-}
-
-.inputField .checkbox, .inputField .button, .inputField .radio
-{
-   width: auto;
-}
-
-.inputField .file
-{
-   width: auto;
-}
-
-.pager
-{
-    float:left;
-}
-
-/* -------------------------------------------------------------- */
-/* Data lists parameters & search bar                             */
-/* -------------------------------------------------------------- */
-
-#list_nav_bar
-{
-    margin-left      : auto;
-    margin-right     : auto;
-    width            : 98%;
-    background-color : #F3F1FF;
-    padding-bottom   : 4px;
-    padding-left     : 4px;
-    padding-right    : 4px;
-    margin-bottom    : 10px;
-    border           : 0px solid #DEDEDE;
-}
-
-#list_nav_bar fieldset
-{
-    border           : 1px solid #DEDEDE;
-    color            : #000000;
-    font-family      : verdana, tahoma, sans-serif;
-    font-size        : 0.90em;
-    padding          : 0px;
-    margin           : 0px;
-    height           : 60px;
-}
-
-#list_nav_select
-{
-    float            : left;
-    width            : 100%;
-    text-align       : center;
-}
-
-#list_nav_search
-{
-    float            : left;
-    width            : 30%;
-    text-align       : center;
-}
-
-.list_nav_option
-{
-    float            : left;
-    text-align       : left;
-    padding          : 0px 4px 4px 4px;
-    margin-left      : 5px;
-}
-
-#list_nav_bar legend
-{
-    font-family      : trebuchet ms, tahoma, sans-serif;
-    font-size        : 1.1em;
-    font-weight      : bold;
-    letter-spacing   : 0.08em;
-}
-
-#list_nav_select label
-{
-}
-
-/* -------------------------------------------------------------- */
-/* Data lists table format                                        */
-/* -------------------------------------------------------------- */
-
-.info
-{
-    margin-left      : auto;
-    margin-right     : auto;
-    margin-bottom    : 10px;
-    width            : 775px;
-    border-collapse  : collapse;
-    border-bottom    : 4px solid #DEDEDE;
-    border-spacing   : 0px;
-}
-
-.info th
-{
-    font-family      : trebuchet ms, tahoma, sans-serif;
-    font-size        : 1.1em;
-    font-weight      : bold;
-    letter-spacing   : 0.08em;
-    vertical-align   : bottom;
-    border-bottom    : 1px solid #DEDEDE;
-    padding          : 4px;
-    text-align       : left;
-}
-
-.info th a
-{
-    color           : #000000;
-    text-decoration : none;
-}
-
-.info th a:hover
-{
-    color           : #5583BE;
-    text-decoration : none;
-}
-
-.even
-{
-    background       : #F7F7F7;
-}
-
-.tableHover
-{
-   background: #EFEFEF;
-}
-
-.info td
-{
-    color            : #888888;
-    border-bottom    : 1px solid #DEDEDE;
-    vertical-align   : middle;
-    padding          : 4px;
-    /*border:1px solid black;*/
-}
-
-.info td a
-{
-    color           : #888888;
-    text-decoration : none;
-}
-
-.info td a:hover
-{
-    color           : #5583BE;
-    text-decoration : none;
-}
-
-/* -------------------------------------------------------------- */
-/* Specific column format                                         */
-/* -------------------------------------------------------------- */
-
-.col_highlighted
-{
-    font-weight      : bold;
-}
-
-/* -------------------------------------------------------------- */
-/* Data lists bottom actions bar                                  */
-/* -------------------------------------------------------------- */
-
-#list_action_bar
-{
-    margin-left      : auto;
-    margin-right     : auto;
-    width            : 768px;
-    padding          : 4px;
-    text-align       : right;
-    /*background-color : #F3F1FF;*/
-    margin-bottom    : 10px;
-    /*border           : 1px dashed #DEDEDE;*/
-}
-
-
-/* -------------------------------------------------------------- */
-/* Positive or negative feedback messages                         */
-/* -------------------------------------------------------------- */
-
-#list #FormError
-{
-    padding-left: 10px;
-}
-/*
-#FormError{
-    align: left;
-    padding-top: 0px;
-}
-
-#list #FormInfo
-{
-    padding-left: 10px;
-}
-
-#FormInfo
-{
-    align: left;
-    padding-top: 0px;
-}
-*/
-.InfoIcon
-{
-    float:left;
-    clear:left;
-    margin-top:3px;
-}
-
-.InfoText
-{
-    color:green;
-    padding-left:20px;
-    padding-top:3px;
-}
-
-.ErrorText
-{
-    color:red;
-    padding-left:20px;
-    padding-top:3px;
-}
-
-/**
- * login screen
- */
-.loginBox
-{
-  width: 300px;
-  margin-top: 25px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-h4, fieldset h4
-{
-    font-family      : trebuchet ms, tahoma, sans-serif;
-    font-size        : 1.1em;
-    font-weight      : bold;
-    letter-spacing   : 0.08em;
-    vertical-align   : bottom;
-    border-bottom    : 1px solid #DEDEDE;
-    padding          : 0px;
-    text-align       : left;
-    text-transform   : capitalize;
-}
-
-.sectionTitle
-{
-    font-size: 1.3em;
-}
-
-.welcomeMessage {
-  margin-bottom: 10px;
-}
-
-/**--------
- * custom stuff for the summary.php script
- */
-#column-left {
-  width: 160px;
-  float:left;
-  padding-left: 5px;
-  margin-top: -10px;
-}
-
-#maincolumn {
-  float:left;
-  width: 436px;
-  padding-left: 10px;
-  padding-right: 10px;
-} 
-
-#column-right {
-  width: 160px;
-  float:right;
-  padding-right: 5px;
-  margin-top: -10px;
-}
-
-#onecolumn {
-  float:left;
-  width: 636px;
-  padding-left: 80px;
-  padding-right: 80px;
-}
-
-
-.pager {
-  width: 636px;
-  border-top: 1px solid #DEDEDE;
-  padding-top: 6px;
-  margin-top: 6px;
-}
-
-.pagerLink {
-
-}
-
-.pagerCurrent {
-  background-color: #FFAABB;
-}
-
-a img {
-  border: 0px;	
-}
-
-#intro
-{
-	padding: 5px 15px 5px 15px;
-	margin-left: auto;
-	margin-right: auto;
-	background-color: #FCFCFF; 
-	border: 1px solid #DEDEDE;
-}
-
-.tag {
-	margin-right: 5px;
-}
-.tag a {
-	text-decoration: none;
-	color: #000000;
-}
-
-.tag a:hover {
-    background       : #818181;
-    color            : #FFFFFF;	
-}
-
-.itemList {
-   list-style: none;
-   margin-left: 1em;
-   padding: 0;
-   color: black;
-}
-
-.item, item a {
-   color: black;
-   text-decoration: underline;
-}
-
-.item a:hover {
-    background       : #818181;
-    color            : #FFFFFF;
-}
-
-h5
-{
-    font-family      : trebuchet ms, tahoma, sans-serif;
-    font-size        : 1.1em;
-    font-weight      : bold;
-    vertical-align   : bottom;
-    padding          : 0px;
-    text-align       : left;
-    text-transform   : capitalize;
-	margin-bottom: 5px;
-	margin-top: 9px;
-}
-
-#FormError
-{
- padding-bottom: 11px;
-}
-
-div.templateScreen {
-  float: left;
-  margin: 5px 15px 15px 0px;
-}
+body {
+    margin:0;
+    padding:0;
+    font-family : Arial, Verdana, Helvetica, sans-serif;
+    font-size : small;
+    background : #fff;
+    width : 100%;
+    color : #333333;
+}
+
+body.column3 {
+   background : #fff;
+}
+
+body.column1 {
+   background : #fff;
+}
+
+#maincolumn p, #onecolumn p {
+   margin:0;
+   padding:0;
+}
+
+#maincolumn h3, #onecolumn h3 {
+   margin:0;
+   margin-top:0px;
+   padding:0;
+}
+
+#paragrafs p {
+   margin-top:14px;
+   margin-bottom:14px;
+   padding:0;
+}
+
+.code {
+   color:#777;
+}
+
+.subtitol {
+    color: #777;
+    }
+    
+.peunoti {
+    color: #777;
+    margin-bottom:12px;
+    padding-bottom:6px;
+    }
+    
+    
+ .peu {
+    margin-bottom:12px;
+    padding-bottom:12px;
+    }
+    
+.postgrav {float:left;margin-right:10px;margin-bottom:3px;}
+
+.Upgrade {
+    display: none;
+    font-weight: bold;
+      }
+      
+#topmenu .invisible, a.invisible {
+    display: none;
+    font-weight: bold;
+      }
+
+#wrapper {
+   margin-left : auto;
+   margin-right : auto;
+   padding-left : 10px;
+   padding-right : 10px;
+   margin-top : 10px;
+    
+}
+
+#header {
+    background: #ce6202;
+    margin-bottom: 6px;
+    color: #fff;
+    width : 98%;
+    height : 60px;
+    margin-bottom:0px;
+	background       : #FFFFFF url("../imgs/admin_logo.png") no-repeat left;
+}
+
+#header h1 {
+   font-family : Arial Narrow, Verdana, Helvetica, sans-serif;
+   font-size : x-large;
+   margin: 0;
+   font-weight : normal;
+   padding: 0 6px 0px 6px;
+}
+
+.typo {
+   font-family : Arial black, Arial, Verdana, Helvetica, sans-serif;
+}
+
+
+#topmenu {
+    background-color: #006666;
+    color: #fff;
+    width : 98%;
+    margin-bottom:12px;
+}
+
+#topmenu ul {
+    list-style:none;
+    margin: 0;
+    padding: 4px 6px 5px 6px;
+}
+
+#topmenu li {
+    margin: 0;
+    padding: 0;
+    margin-right: 0px;
+    display:block;
+    float:left;
+}
+
+#topmenu li.actiu {
+    font-weight: bold;
+    margin-right:12px;
+}
+
+#topmenu a, #topmenu a:link, #topmenu a:visited
+#footer a, #footer a:link, #footer a:visited {
+    text-decoration: none;
+    color: #fff;
+    border: 0;
+}
+
+#topmenu a {
+    display: block;
+    margin-right:12px;
+}
+
+#topmenu a:hover, #footer a:hover, a:active { text-decoration : underline; color : #fff;background-color: #006666; }
+
+#onecolumn {
+    float:left;
+    width:98%;
+    margin-bottom:12px;
+}
+
+#maincolumn {
+    float:left;
+    width:49%;
+}
+
+#intro {
+   background-color:#efefef;
+   margin:0 0 12px 0;
+   padding:12px;
+   border:1px solid #cccccc
+}
+
+#maincolumn p.explicacio,  p.explicacio {
+   background-color:#E6B080;
+   margin:0 0 12px 0;
+   padding:3px !important;
+   border:1px solid #CE6202;
+   color:#fff;
+   font-size:x-small;
+}
+
+
+#notificacio {background-color:#fff;
+   margin:0 0 12px 0;
+   padding:12px;
+   border:1px solid #333333}
+
+#intro p , #notificacio p{
+   margin:0;
+}
+
+#intro h2 {
+    margin:12px 0 0px 0;
+    font-size : medium;
+    border-bottom: 0;
+}
+
+#intro li {
+    font-weight : bold;
+    margin-top:5px;
+}
+
+#intro ol {
+    margin-top:5px;
+    margin-bottom:5px;
+}
+
+#column {
+    float:left;
+    width:49%;
+}
+
+h2 {
+    margin:12px 0 12px 0;
+    border-bottom: 2px solid #cccccc;
+    font-size : small;
+    clear:both;
+}
+
+#boxes {width:300px;float:right;border-left:solid #fff 20px;background-color:#fff}
+#cercador, #categories {border:solid #cccccc 1px; padding:20px;margin-bottom:10px}
+#categories p {color:#777;}
+#categories ul {list-style:none; margin:0;padding:0;line-height:25px;}
+#categories li {display:inline;margin-right:0.5em}
+#cercador form {padding:0;margin:0}
+
+#bloglist {clear:left;}
+
+.subtitle  {color:#777}
+
+.pager {clear:left;margin-top:2em}
+
+#columncontainer { 
+   margin-bottom:12px;
+   margin-left:12px;
+   padding:0 12px 12px 12px; 
+   border : 1px solid #cccccc;
+}
+
+#columncontainer ul {
+          margin-top:10px;
+          margin-bottom:30px;
+}
+
+#columncontainer li {
+          margin-bottom:8px;
+}
+
+
+#columncontainer fieldset {border:1px solid #cccccc; padding-top:10px; margin-top:10px; padding-left:10px; padding-bottom:10px;background-color:#efefef;}
+
+h3 {
+   margin:0;
+   padding:0px;
+      font-size : small;
+}
+
+h3.faq {
+   border-top:solid 1px #cccccc;
+   padding-top:10px !important;
+}
+
+h4 {
+   margin:0;
+   padding:0px;
+      font-size : small;
+      text-decoration:underline;
+      font-weight:normal;
+}
+
+#peu {
+    text-align:center;
+    width:98%;
+    border-top: 2px solid #cccccc;
+    padding-top:6px;
+    padding-bottom:10px;
+}
+
+a:link { color: #32609B; }
+a:visited {color: #223344; }
+a:hover { text-decoration : none; background-color : #818181; color : #fff; }
+
+a img {
+    border: 0;
+}
+
+div.spacer {
+   clear : both;
+   height : 2px;
+   font-size : 2px;
+}
+
+
+
+textarea
+{
+    background       : #FFFFFF;
+    border           : 1px solid #cccccc;
+    color            : #000000;
+    font-family      : arial,verdana, tahoma, sans-serif;
+    font-size        : small;
+    line-height	     : 2em;
+    width	     : 50em;
+    height	     : 10em;
+    padding	     : 2px;
+}
+
+fieldset {border:1px solid #cccccc; padding-top:10px; margin-top:10px; padding-left:10px; padding-bottom:10px;}
+
+fieldset {border:1px solid #cccccc; padding-top:10px; margin-top:10px; padding-left:10px; padding-bottom:10px;}
+legend {padding:2px 4px 2px 4px;background-color: #ffffff;font-weight : bold;}
+
+#registrationform label {display:block}
+#registrationform .formHelp {color:#777777}
+
+#registrationform fieldset {padding:1em 2em 1em 2em}
+
+#checkUserName {width:150px;}
+
+#FormError { padding-bottom: 1em;}
+
+.field
+{
+    top              : 0;
+    left             : 0;
+    margin           : 0 1em 1em 0;
+}
+
+.field .field
+{
+    margin           : 1em 0 0 0;
+}
+
+.field label
+{
+    font-weight      : bold;
+}
+
+.field_checkbox
+{
+    top              : 0;
+    left             : 0;
+}
+
+
+
+.buttons {padding:2em 2em 1em 2em;}
+
+div.buttons input {width:150px}
+
+.templateScreen {float:left; margin:1em 1em 1em 0}
+
+div.templateScreen label {display:inline!important}
+
+div.InfoText p {margin-bottom:1em !important}
+
+.ping label {width:8em;float:left;display:block;clear:both; float:left;margin-top:8px;margin-bottom:0px;}
+.ping fieldset {border:1px solid #cccccc; padding-top:5px; margin-top:5px; padding-left:10px; padding-bottom:10px;margin-bottom:35px;}
+.ping legend {color:#000;padding:2px 4px 2px 4px;background-color: #ffffff;font-weight : bold;}
+.ping input {margin-top:8px;margin-bottom:0px;width:18em;}
+input.input {
+	margin-top:8px;
+	margin-bottom:8px;
+	margin-left:10em;
+	width:6em;
+	}
+#forum {margin-bottom:1em}
+
+div.clearleft {
+   clear : left;
+   height : 0;
+   font-size : 0;
+   line-height : 0px;
+}
+
+div.clear {
+   clear : both;
+   height : 0;
+   font-size : 0;
+   line-height : 0px;
+}
+
+.dalt  {
+   margin-bottom:10px;
+   padding-bottom:4px;
+}
+
+/*
+ * Oscar's additions
+ */
+
+/* -------------------------------------------------------------- */
+/* Navigation/menu bar                                            */
+/* -------------------------------------------------------------- */
+
+#menubar
+{
+    margin-bottom    : 10px;
+    background       : #FFFFFF url("../imgs/bg_menu.jpg") repeat-x;
+    height           : 24px;
+}
+
+#menu
+{
+    padding-top      : 1px;
+    padding-bottom   : 1px;
+/* 	border-bottom    : 1px solid #DEDEDE; */
+}
+
+#menu ul
+{
+    padding         : .2em 0;
+    margin          : 0;
+    list-style-type : none;
+    color           : #FFF;
+    width           : 100%;
+    text-align      : center;
+}
+
+#menu li
+{
+
+    position         : relative;
+    padding          : 0;
+    border-left      : 0px solid #B4B4B4;
+    display          : inline;
+    font-weight      : bold;
+    font-family      : arial, verdana, tahoma, sans-serif;
+    font-size        : 1em;
+    letter-spacing   : 0.20em;
+    text-transform   : uppercase;
+}
+
+#menu a, #menu a:link, #menu a:visited
+{
+    padding          : .2em 1em;
+    color            : #0E3862;
+    text-decoration  : none;
+}
+
+#menu a:hover
+{
+    background       : #818181;
+    color            : #FFFFFF;
+}
+
+#menu li.selected
+{
+    display          : block;
+    width            : auto;
+    padding          : 2px 7px;
+    background       : #FFFFFF;
+    color            : #000000;
+    border-bottom    : 1px solid #FFFFFF;
+}
+
+#menu br
+{
+    clear: both;
+}

Modified: plog/trunk/templates/summary/agreement.template
===================================================================
--- plog/trunk/templates/summary/agreement.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/agreement.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,5 +1,17 @@
-Please edit the contents of the file
-templates/summary/agreement.template to suit your needs.
-If you do not need a service agreement to be accepted by end users, please
-disable this feature by setting 'summary_show_agreement' to 'No' via the
-administration interface.
\ No newline at end of file
+- Per registrar-se al servei Bloc de BalearWeb cal omplir correctament totes les dades requerides. Les dades seran emmagatzemades amb estricta confidencialitat per tal de protegir la privacitat dels usuaris, no es destinaran a cap altre fi i no seran cedides a terceres parts.
+- El servei s'adreça exclusivament a persones residents o originàries de les Illes Balears. 
+- D'acord amb els principis de protecció de dades estipulats en la legislació vigent, l'usuari podrà accedir, modificar i cancel·lar les seves dades, contactant amb BalearWeb.
+- L'accés al servei és personal i intransferible.
+- Només es permet la creació d'un únic bloc per persona.
+- El servei només es pot emprar per a fins legals, no es permet cap contingut violent, racista, xenòfob o pornogràfic.
+- L'usuari és responsable dels continguts i opinions que es publiquin al seu bloc.
+- BalearWeb no és responsable dels continguts i opinions que es publiquin als blocs dels usuaris. No obstant, és propòsit de BalearWeb procurar la correcta utilització del servei.
+- BalearWeb no és responsable de cap perjudici ocasionat per la utilització del servei de blocs. No obstant, és propòsit de BalearWeb procurar el correcte funcionament del servei.
+- Les plantilles dels blocs que ofereix el servei inclouen un enllaç al Bloc de BalearWeb i un al portal de BalearWeb. L'usuari pot personalitzar i modificar la seva plantilla, però ha de mantenir com a mínim un enllaç al Bloc (http://bloc.balearweb.net) o al portal de BalearWeb (http://www.balearweb.com) o a MallorcaWeb (http://www.mallorcaweb.com), MenorcaWeb (http://www.menorcaweb.com), EivissaWeb (http://www.eivissaweb.com) o FormenteraWeb (http://www.formenteraweb.com).
+- És prohibit falsejar el nombre d'impressions, lectures i comentaris del bloc.
+- És prohibit falsejar la data d'un article amb l'objectiu de forçar la seva reaparició a la portada col·lectiva del servei de blocs.
+- BalearWeb es reserva el dret de suspendre temporalment, i sense necessitat de previ avís, l'accés al servei per efectuar operacions de manteniment, actualització o millora del sistema de blocs.
+- BalearWeb es reserva el dret de modificar o ampliar les condicions del servei si ho considera oportú, sense que es produeixi necessàriament un avís previ.
+- Els blocs que no continguin cap article seran anul·lats periòdicament sense que es produeixi necessàriament un avís previ.
+- BalearWeb es reserva el dret de cancel·lar els comptes dels usuaris que abandonin el seu bloc i deixin de publicar-hi articles durant un període superior a dotze mesos, sense que es produeixi necessàriament un avís previ.
+- BalearWeb es reserva el dret de cancel·lar qualsevol compte que no compleixi aquestes condicions.
\ No newline at end of file

Modified: plog/trunk/templates/summary/blog.template
===================================================================
--- plog/trunk/templates/summary/blog.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/blog.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,20 +1,28 @@
     {assign var="updateDate" value=$blog->getUpdateDateObject()}
+    {assign var="BlogCreateDate" value=$blog->getCreateDateObject()}
     {assign var="owner" value=$blog->getOwnerInfo()}
 	{assign var="request" value=$blog->getBlogRequestGenerator()}
 	{assign var=category value=$blog->getBlogCategory()}
 
+    
+       
+                      {if $owner->hasPicture()}
+	{assign var=picture value=$owner->getPicture()}
+	<div style="border:solid #cccccc 1px;width:58px;height:58px;background:url({$request->resourcePreviewLink($picture)}) no-repeat center" class="postgrav">&nbsp;</div>
+    {else}
+        <img src="templates/summary/user.gif" class="postgrav" width="60" height="60" alt="{$owner->getUsername()|strip_tags}" />
+	
+    {/if} 
     <h3>
 	 <a href="{$request->blogLink()}">{$blog->getBlog()|strip_tags}</a>
-	 <a href="?op=BlogProfile&amp;blogId={$blog->getId()}"> ? </a>
 	</h3>
-    <div class="subtitle">
-	    {if $category}{$locale->tr("category")}: {$category->getName()}{/if}
+    <div class="subtitle">Articles: {$blog->getTotalPosts()} | Comentaris: {$blog->getTotalComments()} | Retroenllaços: {$blog->getTotalTrackbacks()}{if $category} | {$locale->tr("category")}: <a href="?op=BlogList&amp;blogCategoryId={$category->getId()}">{$category->getName()}</a>{/if}
     </div>
-    <p>
-        {$blog->getAbout()|strip_tags}
-    </p>
-    <div class="bloginfo">
-        {$locale->tr("users")} 
-		{assign var=blogUsers value=$blog->getUsersInfo()}
-			<a href="?op=UserProfile&amp;userId={$owner->getId()}">{$owner->getUsername()|strip_tags}</a>{foreach from=$blogUsers item=blogUser name=blogUsersLoop}{if $owner->getId() != $blogUser->getId()}, <a href="?op=UserProfile&amp;userId={$blogUser->getId()}">{$blogUser->getUsername()|strip_tags}</a>{/if}{/foreach}
-    </div>
+
+         <div class="peu">
+			{assign var=blogUsers value=$blog->getUsersInfo()}
+			Data de creació: {$locale->formatDate($BlogCreateDate,"%e %B %Y")} | Autors: 
+			<strong>{$owner->getUsername()|strip_tags}{foreach from=$blogUsers item=blogUser name=blogUsersLoop}{if $owner->getId() != $blogUser->getId()}, {$blogUser->getUsername()|strip_tags}{/if}{/foreach}</strong>
+        </div>
+
+        <div class="clearleft">&nbsp</div>

Modified: plog/trunk/templates/summary/blogslist.template
===================================================================
--- plog/trunk/templates/summary/blogslist.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/blogslist.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,46 +1,78 @@
-{include file="summary/header.template" section=$locale->tr("blogs")}
-<div id="onecolumn">
-    <div id="intro">
-	<h4>{$locale->tr("blog_categories")}</h4>
-	<span class="tag">
-	{if $blogCategoryId != 0}
-	<a href="?op=BlogList&amp;globalArticleCategoryId=0">{$locale->tr("all")}</a>
-	{else}
-	{$locale->tr("all")}	
-	{/if}
-	</span>	
-	{foreach from=$blogCategories item=blogCategory}
-		{math assign=fontSize equation="(int)((x-y)/step)+12" x=$blogCategory->getNumActiveBlogs() y=$min step=$step}
-		<span class="tag">
-		{if $blogCategory->getId() != $blogCategoryId}
-		<a style="font-size: {$fontSize}px" href="?op=BlogList&amp;blogCategoryId={$blogCategory->getId()}">{$blogCategory->getName()}</a>
-		{else}
-		<span style="font-size: {$fontSize}px">{$blogCategory->getName()}</span>
-		{/if}		
-		</span>
-	{/foreach}
-    </div>
-    {if empty($currentBlogCategory)}
-      <h4>{$locale->tr("all")}
-		{if $blogs}
-		  <a href="{$url->getRssUrl()}?summary=1&amp;type=blogslist">
-			<img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" />
-		  </a>
-		{/if}
-      </h4>
-    {else}
-      <h4>{$currentBlogCategory->getName()} ({$currentBlogCategory->getNumBlogs()})
-		{if $blogs}
-	      <a href="{$url->getRssUrl()}?summary=1&amp;type=blogslist&amp;blogCategoryId={$currentBlogCategory->getId()}">
-		    <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" />
-		  </a>
-		{/if}
-      </h4>
-    {/if}
-
-    {foreach from=$blogs item=blog}
-		{include file="summary/blog.template"}
-    {/foreach}
-  {pager style="links"}
-</div>
-{include file="summary/footer.template"}
+{include file="summary/header.template" selected="blogslist" columns=1}
+
+<div id="onecolumn">
+
+    {if empty($currentBlogCategory)}
+      <h2>{$locale->tr("all")}
+		{if $blogs}
+		  <a href="{$url->getRssUrl()}?summary=1&amp;type=blogslist">
+			<img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" />
+		  </a>
+		{/if}
+      </h2>
+    {else}
+      <h2>{$currentBlogCategory->getName()} ({$currentBlogCategory->getNumBlogs()})
+		{if $blogs}
+	      <a href="{$url->getRssUrl()}?summary=1&amp;type=blogslist&amp;blogCategoryId={$currentBlogCategory->getId()}">
+		    <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" />
+		  </a>
+		{/if}
+      </h2>
+    {/if}
+    
+
+           
+<div id="boxes">
+<div id="cercador">
+<form id="searchForm" method="post" action="{$smarty.server.PHP_SELF}">
+<div>
+            <label for="searchTerms"><input type="text" tabindex="1" name="searchTerms" id="searchTerms" value="" size="14" /></label>
+        <input type="hidden" name="searchType" id="searchType" value="2" />     
+        <input type="hidden" name="op" value="summarySearch" />            
+        <input type="submit" class="button" name="summarySearch" value="Cercar blocs" tabindex="21" />
+    </div>
+    </form>
+    
+</div>
+<div id="categories">
+    
+<h3>{$locale->tr("blog_categories")}</h3>
+	<ul>
+	<li>
+	{if $blogCategoryId != 0}
+	<a href="?op=BlogList&amp;globalArticleCategoryId=0">{$locale->tr("all")}</a>
+	{else}
+	{$locale->tr("all")}	
+	{/if}
+	</li>	
+	
+	{foreach from=$blogCategories item=blogCategory}
+  {if $blogCategory->getNumBlogs() > 0}
+		{math assign=fontSize equation="(int)((x-y)/step)+12" x=$blogCategory->getNumActiveBlogs() y=$min step=$step}
+		<li>
+		{if $blogCategory->getId() != $blogCategoryId}
+		<a style="font-size: {$fontSize}px" href="?op=BlogList&amp;blogCategoryId={$blogCategory->getId()}">{$blogCategory->getName()}</a>
+		{else}
+		<span style="font-size: {$fontSize}px">{$blogCategory->getName()}</span>
+		{/if}		
+		</li>
+	
+  {/if}
+{/foreach}
+</ul> 
+
+   
+</div>   
+</div> 
+    
+    
+    
+    {foreach from=$blogs item=blog}
+        {include file="summary/blog.template"}
+        
+    {/foreach}
+
+{pager style="links"}
+
+</div>
+{include file="summary/footer.template"}

Modified: plog/trunk/templates/summary/faq.template
===================================================================
--- plog/trunk/templates/summary/faq.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/faq.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,11 +1,172 @@
 {include file="summary/header.template" selected="faq" columns=1}
 
 <div id="onecolumn">
-    <h2>{$locale->tr("summary_faq")}</h2>
+    <h2>Preguntes freqüents</h2>
+    <div id="paragrafs">
+    
+    <ol>
+<li><a href="#que-es">Què és un bloc?</a></li>
+<li><a href="#quines-opcions">Quines opcions ofereix el servei bloc de BalearWeb?</a></li>
+<li><a href="#modificar-aspecte">Com modificar l'aspecte dels articles d'un bloc?</a></li>
+<li><a href="#opcions-aspecte">Opcions avançades per modificar l'aspecte dels articles d'un bloc</a></li>
+<li><a href="#spam">Com evitar els comentaris publicitaris o spam?</a></li>
+<li><a href="#comptador">Com instal·lar un comptador de visites al bloc?</a></li>
+<li><a href="#imatge-plantilla">Com inserir una imatge personalitzada a la plantilla del teu bloc?</a></li>
+<li><a href="#categories-globals">Com aprofitar les categories de blocs i les categories d'articles globals?</a></li>
+
+</ol> 
+    
+    <h3 class="faq" id="que-es">1. Què és un bloc?</h3>
+    <p>
+     Un bloc, també anomenat blog, weblog i bitàcola, és un diari interactiu personal que és administrat per un o varis autors mitjançant formularis en línia, essent molt fàcil de crear i d'actualitzar.
+    </p>
+    <div class="dalt"><a href="#paragrafs">A dalt</a></div>
+    
+    <h3 class="faq" id="quines-opcions">2. Quines opcions ofereix el servei bloc de BalearWeb?</h3>
+    <ul>
+    <li>Un diari interactiu per a cada usuari amb adreça web tipus: http://usuari.balearweb.net/</li> 
+    <li>Possibilitat d'escollir l'idoma del bloc entre català, espanyol, anglès i altres</li>
+    <li>Possibilitat d'allotjar àlbums de fitxers (fotos, documents, etc.)</li>
+    <li>Entorn web programat en llenguatge XHTML estricte i complint les directrius WAI d'accessibilitat</li>
+    <li>Filtre de comentaris brossa (spam)</li>
+    <li>Possibilitat de tenir més d'un usuari per a cada bloc</li>
+    <li>Portal del servei on surten les últimes aportacions dels diaris dels usuaris</li>
+    <li>Pings automatitzats</li>
+    <li>Visualització dels retroenllaços (trackback) rebuts i possibilitat de fer-ne</li>
+    <li>Possibilitat d'afegir nous posts via XML-RPC per fer-ho per exemple des d'una aplicació</li>
+    <li>Espai ilimitat per a articles i fins a 20 MB per allòtjar fitxers, ampliable per motius justificats</li>
+    <li>Diferents plantilles per canviar l'aspecte gràfic del bloc</li> 
+    <li>Possibilitat de crear plantilles totalment personalitzades per a cada bloc</li>
+    <li>Suport per a Google Analytics</li>
+    </ul>
+    
+    <div class="dalt"><a href="#paragrafs">A dalt</a></div>
+    
+    <h3 class="faq" id="modificar-aspecte">3. Com modificar l'aspecte dels articles d'un bloc?</h3>
 
-    <h4>{$locale->tr("summary_faq_question")}</h4>
+<p>Els usuaris que vulguin modificar l'aspecte i l'estructura dels
+articles que publiquin al seu bloc, per incorporar enlla&ccedil;os, fer
+salts de l&iacute;nia, afegir imatges, etc., tenen dues opcions:</p>
+
+<ol>
+<li>Ajudar-se de l'editor HTML visual que incorpora el servei de
+blocs. L'editor HTML per defecte es troba desactivat, per&ograve; es
+pot reactivar entrant dins l'apartat d'<strong>Arranjaments > Preferències del bloc</strong> de la zona
+l'administraci&oacute;.</li>
+<li>Utilitzar directament el codi XHTML apropiat. Aquesta
+&uacute;ltima opci&oacute; &eacute;s la que recomana BalearWeb, ja que
+permet tenir un control m&eacute;s conscient del codi que
+introdu&iuml;m dins de cada article i &eacute;s la millor manera de
+crear continguts que compleixin amb els est&agrave;ndards XHTML i les
+directrius d'accessibilitat.</li>
+</ol>
+
+<p>Si l'usuari opta per aquesta segona opci&oacute; haur&agrave; de
+con&egrave;ixer algunes nocions b&agrave;siques sobre XHTML. Com a
+m&iacute;nim haur&agrave; de saber que:</p>
+
+<ul>
+<li>per fer limitar par&agrave;grafs i marcar salts de l&iacute;nia
+s'utilitzen les etiquetes: <span class="code">&lt;p&gt;Text del par&agrave;graf&lt;/p&gt;</span></li>
+<li>per posar un enlla&ccedil; s'utilitza: <span class="code">&lt;a
+href="http://www.link.com"&gt;Paraula enlla&ccedil;ada&lt;/a&gt;</span></li>
+<li>per incorporar una imatge s'utilitza: <span class="code">&lt;img
+src="http://www.rutadelaimatge.com" alt="Text breu que descriu la
+imatge" /&gt;</span></li>
+<li>per posar t&iacute;tols s'utilitzen les etiquetes: <span class="code">&lt;h3&gt;Titol
+que volem destacar&lt;/h3&gt;</span></li>
+</ul>
+
+<p>L'editor simple, és a dir el que no és visual i el que ens mostra el codi tal qual, incorpora uns botons que ens faciliten la tasca d'introduir les etiquetes bàsiques.</p>
+
+<p>Al peu de totes les p&agrave;gines del bloc hi ha un enlla&ccedil; a
+l'eina de validaci&oacute; XHTML que ofereix el W3C (World Wide Web
+Consortium) i facilita la identificaci&oacute; de qualsevol errada.</p>
+
+<div class="dalt"><a href="#paragrafs">A dalt</a></div>
+
+<h3 class="faq" id="opcions-aspecte">4. Opcions avan&ccedil;ades per modificar l'aspecte dels articles d'un
+bloc</h3>
+
+<p>L'usuari que opti per controlar l'aspecte i estructura dels articles
+del seu bloc utilitzant directament el codi XHTML (veure el punt
+anterior d'aquest document) podr&agrave; tenir un major control sobre
+l'aspecte dels articles, per exemple triar el tipus d' alineaci&oacute;
+que tendran les imatges o destacar paraules amb negreta i cursiva,
+utilitzant les classes o estils que ja hi ha definits al full d'estil
+CSS del bloc.</p>
+
+<p>Per exemple per situar una imatge flotant a l'extrem dret de
+l'article i
+fer que el text continu&iuml; pel costat esquerre, afegirem la
+propietat class="float" a l'etiqueta de la imatge de la seg&uuml;ent
+forma: <span class="code">&lt;img src="http://www.rutaimatge.com" class="floatright"
+alt="Text breu que descriu la imatge" /&gt;&lt;p&gt;Par&agrave;graf amb
+un text llarg que abraci la imatge&lt;/p&gt;</span></p>
+
+<p>I si en canvi volem que la foto quedi situada centrada, sense cap
+text al seu costat, utilitzarem la propietat class="center"
+aix&iacute;: 
+<span class="code">&lt;img src="http://www.rutaimatge.com" class="center" alt="Text
+breu que descriu la imatge" /&gt;&lt;p&gt;Paragraf que pots ser
+m&eacute;s curt&lt;/p&gt;</span></p>
+
+<p>En aquests dos casos hem afegit la classe o estil a un element
+existent, una imatge, i el podr&iacute;em aplicar igualment a
+tot un par&agrave;graf, a un t&iacute;tol o a qualsevol altre element.
+Per&ograve; si en canvi volem destacar una part del text, que no
+&eacute;s un element en si mateix, per poder especificar l'estil,
+haurem d'afegir el marcador &lt;span&gt;, de la seg&uuml;ent forma:
+<span class="code">&lt;p&gt;Aix&ograve; seria un par&agrave;graf i &lt;span
+class="bold"&gt;aquesta paraula&lt;/span&gt; es mostraria en
+negreta.&lt;/p&gt;</span></p>
+
+<p>Les classes b&agrave;siques definides al full d'estil que
+poden
+ser d'utilitat alhora de publicar articles s&oacute;n:</p>
+
+<h4>Per alinear elements</h4>
+<ul>
+<li><span class="code">class="left"</span> (per alinear elements a l'esquerra)</li>
+<li><span class="code">class="right"</span> (per alinear elements a la dreta)</li>
+<li><span class="code">class="center"</span> (per centrar elements)</li>
+</ul>
+<h4>Per flotar elements</h4>
+<ul>
+<li><span class="code">class="floatleft"</span> (per flotar elements a l'esquerra)</li>
+<li><span class="code">class="floatright"</span> (per flotar elements a la dreta)</li>
+</ul>
+<h4>Per destacar text</h4>
+<ul>
+<li><span class="code">class="bold"</span> (per destacar text en negreta)</li>
+<li><span class="code">class="italic"</span> (per destacar text en cursiva)</li>
+<li><span class="code">class="underline"</span> (per destacar text amb subratllat)</li>
+</ul>
+    
+<div class="dalt"><a href="#paragrafs">A dalt</a></div>
+
+    <h3 class="faq" id="spam">5. Com evitar els comentaris publicitaris o spam?</h3>
     <p>
-    {$locale->tr("summary_faq_description")}
+     Tots els usuaris haurien d'activar els filtres de protecció contra l'spam. Per això cal entrar dins l'eina d'administració, accedir a la secció <strong>Arranjaments</strong> > <strong>Exclusió de contingut</strong> i activar aquest complement. Després cal fer el mateix amb els complements, <strong>Exclusió d'IP</strong> i <strong>Validació de retroenllaços</strong>, en aquest últim complement cal activar les tres opcions de validació de retroenllaços disponibles. Opcionalment també es pot activar el complement de <strong>Moderació de comentaris</strong> per posposar la publicació dels escrits fins que siguin revisats i marcats com a comentaris vàlids.
     </p>
+    <div class="dalt"><a href="#paragrafs">A dalt</a></div>
+    
+    <h3 class="faq" id="comptador">6. Com instal·lar un comptador de visites al bloc?</h3>
+    <p>
+     El servei de blocs de BalearWeb disposa d'un complement que permet utilitzar el sistema d'estadístiques Google Analytics, servei gratuït de Google que facilita informació extensa i detallada sobre el nombre de visites, ubicació geogràfica dels usuaris, procedència de les visites, etc. Per activar el complement primer cal sol·licitar un compte a <a href="http://www.google.com/analytics/">Google Analytics</a> i un cop ens l'hagin concedit, poden entrar al l'administració del bloc: <strong>Arranjaments > Google Analytics</strong> i activar el complement.
+    </p>
+    <div class="dalt"><a href="#paragrafs">A dalt</a></div>
+    
+    <h3 class="faq" id="imatge-plantilla">7. Com inserir una imatge personalitzada a la plantilla del teu bloc?</h3>
+    <p>Per inserir una imatge personalitza a la plantilla del teu bloc, que a més a més es mostrarà a la pàgina principal i altres seccions col·lectives del servei de <a href="http://bloc.balearweb.net">blocs de BalearWeb</a>, el primer que hem de fer és col·locar la imatge als àlbums del bloc. Per això entrarem a l'administració dels blocs, secció <strong>Fitxers &gt; Afegir recurs</strong>. Després accedirem a la secció <strong>Arranjaments &gt; Preferències de l'usuari</strong> i allà escollirem la <strong>imatge</strong> com a imatge de l'usuari. Dins de la mateixa secció de <strong>Preferències de l'usuari</strong> hem d'introduir algun text al camp que diu <strong>Biografia de l'usuari</strong>. En algunes plantilles és necessari omplir els dos camps (imatge i biografia) perquè els visualitzi la informació. Si falta la biografia o la foto, aleshores no es mostra res. En algunes plantilles basta incloure una de les dues informacions.
+    </p>
+    <div class="dalt"><a href="#paragrafs">A dalt</a></div>
+    
+    <h3 class="faq" id="categories-globals">8. Com aprofitar les categories de blocs i les categories d'articles globals?</h3>
+    <p>Cada bloc es pot assignar a una categoria específica dins del portal col·lectiu. Això facilita la localització de <a href="http://bloc.balearweb.net/summary.php?op=BlogList">blocs per temes</a>: Art, Educació, Esport, Fotografia... Per assignar el teu bloc a una categoria específica, entra dins <strong>Arranjaments &gt; Preferències del bloc</strong>. D'altra banda hi ha les diferents <a href="http://bloc.balearweb.net/summary.php?op=PostList">categories d'articles globals</a> a les quals pots assignar cada article que escrius. Així, per exemple, encara que el teu bloc estigui classificat dins de la categoria global de blocs Educació, pots escriure un article dins la categoria global d'articles Política, un altre article dins Medi Ambient, etc. L'elecció de categoria global d'article es fa en el moment d'afegir un article a través de les opcions que hi ha a la dreta de l'editor. No has de confondre aquestes categories globals d'article que afecten al portal col·lectiu i que venen predefinides, amb les categories pròpies del teu bloc i que tu mateix pots crear.</p>
+    <div class="dalt"><a href="#paragrafs">A dalt</a></div>
+    
+</div> 
+</div>    
 
 {include file="summary/footer.template"}

Modified: plog/trunk/templates/summary/footer.template
===================================================================
--- plog/trunk/templates/summary/footer.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/footer.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,4 +1,8 @@
-      </div>
-    </div>
-  </body>
-</html>
+<div class="spacer">&nbsp;</div>
+<div id="peu">
+  Powered by <a href="http://www.lifetype.net">LifeType</a>	-
+  Design by <a href="http://www.balearweb.com">BalearWeb</a> 
+</div>
+</div>
+</body>
+</html>
\ No newline at end of file

Modified: plog/trunk/templates/summary/header.template
===================================================================
--- plog/trunk/templates/summary/header.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/header.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,60 +1,41 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" >
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" >
-<head>
-<meta http-equiv="content-type" content="text/html;charset={$locale->getCharset()}" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<title>{$locale->tr("summary")}</title>
-{if $locale->getDirection()=="rtl"}
-<link rel="stylesheet" href="styles/summary-rtl.css" type="text/css" media="screen" />
-{else}
-<link rel="stylesheet" href="styles/summary.css" type="text/css" media="screen" />
-{/if}
-<!--[if IE ]>
-<link rel="stylesheet" href="styles/summary-ie.css" type="text/css" media="screen" />
-<![endif] -->
-<script type="text/javascript">
-    var blogLocale = '{$locale->getCharset()|upper}';
-  	// base url where we can find the admin.php script
-  	var plogBaseUrl = "{$baseurl}";
-	var plogSummaryBaseUrl = plogBaseUrl + "/summary.php";
-	var plogBlogId = "0";
-</script>
-<script type="text/javascript" src="js/ui/default.js"></script>
-<script type="text/javascript" src="js/ui/common.js"></script>
-</head>
-<body>
-
-<div id="container" >
-    <div id="header" >
-        <h1><span>{$locale->tr("summary")}</span></h1>
-    </div>
-    <hr class="hide" />
-    <div id="skipNav">
-    <ul title="Accessibility options">
-    <li><a href="#menubar">Skip to Menu Bar</a></li>
-    <li><a href="#navigation">Skip to Navigation Bar</a></li>
-    <li><a href="#list_nav_bar">Search/List Options</a></li>
-    <li><a href="#list">Skip to Lists</a></li>
-    </ul>
-    </div>
-    <hr class="hide" />
-    <div id="menubar">
-        <div id="menu">
-          <ul class="menuTop">
-             <li class="menuOption"><a href="summary.php?op=Summary">{$locale->tr("summary")}</a></li>
-             <li class="menuOption"><a href="summary.php?op=Register&amp;start=1">{$locale->tr("register")}</a></li>
-             <li class="menuOption"><a href="summary.php?op=PostList">{$locale->tr("post")}</a></li>
-             <li class="menuOption"><a href="summary.php?op=BlogList">{$locale->tr("blogs")}</a></li>
-             <li class="menuOption"><a href="summary.php?op=UserList">{$locale->tr("users")}</a></li>
-          </ul>
-        </div>
-    </div>
-	{if $section != "" }
-    <div id="nav_bar">
-      <div id="section_title">
-         <h2>{$section}</h2>
-      </div>
-      <br style="clear:both;" />
-    </div>
-	{/if}
-    <div id="content" >
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ca" lang="ca">
+<head>
+    <title>{$serviceName}</title>
+    <meta http-equiv="content-type" content="text/html; charset={$locale->getCharset()}" />
+    <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
+    <style type="text/css" media="screen">@import "styles/summary.css";</style>
+    <meta name="description" content="{$serviceName}" />
+    <script type="text/javascript">
+    var blogLocale = '{$locale->getCharset()|upper}';
+  	// base url where we can find the admin.php script
+  	var plogBaseUrl = "{$baseurl}";
+	var plogSummaryBaseUrl = plogBaseUrl + "/summary.php";
+	var plogBlogId = "0";
+</script>
+<script type="text/javascript" src="js/ui/default.js"></script>
+<script type="text/javascript" src="js/ui/common.js"></script>
+</head>
+<body {if $columns eq 1}class="column1"{else}class="column3"{/if}>
+
+<div id="wrapper">
+
+<div id="header">
+
+</div>
+
+
+<map name="linksmenu" id="linksmenu" title="Menú de navegació">
+    <div id="menubar">
+        <div id="menu">
+          <ul class="menuTop">
+             <li class="menuOption"><a href="summary.php?op=Summary">{$locale->tr("summary")}</a></li>
+             <li class="menuOption"><a href="summary.php?op=Register&amp;start=1">{$locale->tr("register")}</a></li>
+             <li class="menuOption"><a href="summary.php?op=PostList">{$locale->tr("post")}</a></li>
+             <li class="menuOption"><a href="summary.php?op=BlogList">{$locale->tr("blogs")}</a></li>
+             <li class="menuOption"><a href="summary.php?op=UserList">{$locale->tr("users")}</a></li>
+          </ul>
+        </div>
+    </div>
+</map>
+

Modified: plog/trunk/templates/summary/index.template
===================================================================
--- plog/trunk/templates/summary/index.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/index.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,148 +1,124 @@
 {include file="summary/header.template" selected="index"}
 
-<div id="column-left">
-    <form id="loginForm" method="post" action="admin.php">
-    <fieldset class="inputField">
-        <h4>{$locale->tr("login")}</h4>
-        {dynamic}
-        {if $authuser}
-          {assign var=userName value=$authuser->getUsername()}
-          {$locale->pr("summary_welcome_msg", $userName)}<br/>
-          <a href="admin.php?op=blogSelect">{$locale->tr("summary_go_to_admin")}</a>
-        {else}        
-        <div class="field">
-            <label for="userName">{$locale->tr("username")}</label>
-            <input type="text" tabindex="10" name="userName" id="userName" value="" maxlength="50" />
-        </div>
-        <div class="field">
-            <label for="userPassword">{$locale->tr("password")}</label>
-            <input type="password" tabindex="11" name="userPassword" id="userPassword" maxlength="50" />
-        </div>
-        <input type="submit" class="button" name="Login" value="{$locale->tr("login")}" tabindex="12" />
-        <input type="hidden" name="op" value="Login" />
-       	<a href="?op=resetPasswordForm">{$locale->tr("password_forgotten")}</a>			    
-        {/if}
-        {/dynamic}
-		<br/>
-	    
-    </fieldset>
-    </form>
-    {assign var=recentBlogs value=$summaryStats->getRecentBlogs()}
-    <h4>{$locale->tr("summary_newest_blogs")}
-      <a href="{$url->getRssUrl()}?summary=1&amp;type=newestblogs">
-        <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" 
-           alt="RSS" /></a>    
-    </h4>
-    {if $recentBlogs}
-      <ul class="itemList">
-        {foreach from=$recentBlogs item=blog}
-          {assign var="url" value=$blog->getBlogRequestGenerator()}
-		  {** remove this if you're having problems with blogs in encondings other than iso-8859-1 **}
-          <li class="item"><a href="{$url->blogLink()}">{$blog->getBlog()|strip_tags|utf8_truncate:24}</a></li>
-        {/foreach}
-      </ul>
-    {/if}
-</div>
 
 <div id="maincolumn">
     <div id="intro">
-        <h4>{$locale->tr("summary_welcome")}</h4>
-        {$locale->tr("summary_welcome_paragraph")}
+        <p>{$locale->tr("summary_welcome_paragraph")}</p>
     </div>
-	<br/>
-
-    <div id="global_article_categories">
-	<h4>{$locale->tr("global_article_categories")}</h4>
-	<span class="tag">
-	{if $globalArticleCategoryId != 0}
-	<a href="?op=Summary&amp;globalArticleCategoryId=0">{$locale->tr("all")}</a>
-	{else}
-	{$locale->tr("all")}
-	{/if}
-	</span>
-	{foreach from=$globalArticleCategories item=globalArticleCategory}
-		{math assign=fontSize equation="(int)((x-y)/step)+12" x=$globalArticleCategory->getNumActiveArticles() y=$min step=$step}
-		<span class="tag">
-		{if $globalArticleCategory->getId() != $globalArticleCategoryId}
-		<a style="font-size: {$fontSize}px" href="?op=Summary&amp;globalArticleCategoryId={$globalArticleCategory->getId()}">{$globalArticleCategory->getName()}</a>
-		{else}
-		<span style="font-size: {$fontSize}px">{$globalArticleCategory->getName()}</span>
-		{/if}
-		</span>
-	{/foreach}
-    </div>    
     {include file="summary/recent.template"}
 </div>
 
-<div id="column-right">
+<div id="column">
+<div id="columncontainer">
+    <h2>{$locale->tr("search_s")}</h2>
     <form id="searchForm" method="post" action="{$smarty.server.PHP_SELF}">
     <fieldset class="inputField">
-        <h4>{$locale->tr("summary_search_blogs")}</h4>
-        <div class="field">
-            <label for="searchTerms">{$locale->tr("search_terms")}</label><br />
-            <input type="text" tabindex="20" name="searchTerms" id="searchTerms" value="" />
-        </div>
-        <div class="field">
-            <label for="searchType">{$locale->tr("search_type")}</label><br />
+            <label for="searchTerms">{$locale->tr("search")}:
+            <input type="text" tabindex="1" name="searchTerms" id="searchTerms" value="" size="14" /></label>
+            <label for="searchType">{$locale->tr("search_type")}:
 	   	    <select name="searchType" id="searchType">
 	    	   	<option value="1">{$locale->tr("posts")}</option>
 	    	   	<option value="2">{$locale->tr("blogs")}</option>
 	    	   	<option value="3">{$locale->tr("resources")}</option>
     	    </select>
-        </div>          
+   </label>        
         <input type="hidden" name="op" value="summarySearch" />            
         <input type="submit" class="button" name="summarySearch" value="{$locale->tr("search")}" tabindex="21" />
     </fieldset>
-    </form>	
-    <h4>{$locale->tr("summary_most_active_blogs")}
+    </form>
+
+    <h2>{$locale->tr("login")}</h2>
+    <form id="loginForm" method="post" action="admin.php">
+    <fieldset class="inputField">
+	    {dynamic}
+	    {if $authuser}
+	      {assign var=userName value=$authuser->getUsername()}
+	      {$locale->pr("summary_welcome_msg", $userName)}<br/>
+	      <a href="admin.php?op=blogSelect">{$locale->tr("summary_go_to_admin")}</a>
+	    {else}	
+            <label for="userName">{$locale->tr("username")}:
+			<input type="text" tabindex="2" name="userName" id="userName" value="" size="8" maxlength="50" /></label>
+            <label for="userPassword">{$locale->tr("password")}: 
+			<input type="password" tabindex="3" name="userPassword" id="userPassword" size="8" maxlength="50" /></label>
+            <input type="submit" name="Login" value="{$locale->tr("login")}" class="button" />
+            <input type="hidden" name="op" value="Login"  />
+        	<br/>
+	        <a href="?op=resetPasswordForm">{$locale->tr("password_forgotten")}</a>	
+		{/if}
+		{/dynamic}
+    </fieldset>
+    </form>
+    
+    <h2>{$locale->tr("summary_most_active_blogs")}
     {assign var=activeBlogs value=$summaryStats->getMostActiveBlogs()}
       <a href="{$url->getRssUrl()}?summary=1&amp;type=mostactiveblogs">
         <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" 
          alt="RSS" /></a>    
-    </h4>
+    </h2>
     {if $activeBlogs}
       <ul class="itemList">
         {foreach from=$activeBlogs item=blog}
 	      {assign var="url" value=$blog->getBlogRequestGenerator()}
-          <li class="item"><a href="{$url->blogLink()}">{$blog->getBlog()|strip_tags|utf8_truncate:24}</a></li>
+          <li class="item"><a href="{$url->blogLink()}">{$blog->getBlog()|strip_tags|escape:"htmlall"|truncate:60}</a></li>
         {/foreach}
       </ul>
     {/if}
-
-    <h4>{$locale->tr("summary_most_commented_articles")}
-    {assign var=commentedPosts value=$summaryStats->getMostCommentedArticles()}
-      <a href="{$url->getRssUrl()}?summary=1&amp;type=mostcommented">
+    
+    
+    
+        {assign var=recentBlogs value=$summaryStats->getRecentBlogs()}
+    <h2>{$locale->tr("summary_newest_blogs")}
+      <a href="{$url->getRssUrl()}?summary=1&amp;type=newestblogs">
         <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" 
-         alt="RSS" /></a>
-	</h4>
-    {if $commentedPosts} 
+           alt="RSS" /></a>    
+    </h2>
+     {if $recentBlogs}
       <ul class="itemList">
-        {foreach name=commented from=$commentedPosts item=post}
-	      {assign var="blog" value=$post->getBlogInfo()}
-	      {assign var="url" value=$blog->getBlogRequestGenerator()}	
-          <li class="item">		
-            <a href="{$url->postPermalink($post)}">{$post->getTopic()|strip_tags}</a> ({$post->getTotalComments()})<br />
-          </li>
+        {foreach from=$recentBlogs item=blog}
+          {assign var="url" value=$blog->getBlogRequestGenerator()}
+		  {** remove this if you're having problems with blogs in encondings other than iso-8859-1 **}
+          <li class="item"><a href="{$url->blogLink()}">{$blog->getBlog()|strip_tags|escape:"htmlall"|truncate:60}</a></li>
         {/foreach}
       </ul>
-    {/if}    
+    {/if}
 
-    <h4>{$locale->tr("summary_most_read_articles")}
+    <h2>{$locale->tr("summary_most_read_articles")}
       {assign var=readestBlogs value=$summaryStats->getMostReadArticles()}
         <a href="{$url->getRssUrl()}?summary=1&amp;type=mostread">
           <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" 
           alt="RSS" /></a>		
-     </h4>
+     </h2>
       {if $readestBlogs}
         <ul class="itemList">
           {foreach name=readest from=$readestBlogs item=post}
             {assign var="blog" value=$post->getBlogInfo()}
 	        {assign var="url" value=$blog->getBlogRequestGenerator()}		
             <li class="item">
-              <a href="{$url->postPermalink($post)}">{$post->getTopic()|strip_tags}</a> ({$post->getNumReads()})<br />
+              <a href="{$url->postPermalink($post)}">{$post->getTopic()|strip_tags|escape:"htmlall"|truncate:60}</a> ({$post->getNumReads()})<br />
            </li>
           {/foreach}
         </ul>
       {/if}
+
+    <h2>{$locale->tr("summary_most_commented_articles")}
+    {assign var=commentedPosts value=$summaryStats->getMostCommentedArticles()}
+      <a href="{$url->getRssUrl()}?summary=1&amp;type=mostcommented">
+        <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" 
+         alt="RSS" /></a>
+	</h2>
+    {if $commentedPosts} 
+      <ul class="itemList">
+        {foreach name=commented from=$commentedPosts item=post}
+	      {assign var="blog" value=$post->getBlogInfo()}
+	      {assign var="url" value=$blog->getBlogRequestGenerator()}	
+          <li class="item">		
+            <a href="{$url->postPermalink($post)}">{$post->getTopic()|strip_tags|escape:"htmlall"|truncate:60}</a> ({$post->getTotalComments()})<br />
+          </li>
+        {/foreach}
+      </ul>
+    {/if}    
+
 </div>
-{include file="summary/footer.template"}
+</div>
+
+{include file="summary/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/message.template
===================================================================
--- plog/trunk/templates/summary/message.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/message.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,16 +1,16 @@
-{include file="summary/header.template" section=$locale->tr("message")}
-<div id="onecolumn">
+{include file="summary/header.template" selected="register" columns=1}
+
+
+  <div id="onecolumn">
+  
+ <h2>Creació de bloc</h2>
+ 
 {if $viewIsSuccess}
-<div id="FormInfo">
-  <img src="imgs/admin/icon_info-16.png" alt="Info" class="InfoIcon" />
-  <p class="InfoText">{if $message==""}{$viewSuccessMessage}{else}{$message}{/if}</p>
-</div>
+  <div class="InfoText">{if $message==""}{$viewSuccessMessage}{else}{$message}{/if}</div>
 {/if}
 {if $viewIsError}
-<div id="FormError">
-  <img src="imgs/admin/icon_warning-16.png" alt="Info" class="InfoIcon" />
-  <p class="ErrorText">{if $message==""}{$viewErrorMessage}{else}{$message}{/if}</p>
-</div>
+  <div class="ErrorText">{if $message==""}{$viewErrorMessage}{else}{$message}{/if}</div>
 {/if}
+
 </div>
 {include file="summary/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/post.template
===================================================================
--- plog/trunk/templates/summary/post.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/post.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,21 +1,35 @@
-    {assign var="blog" value=$post->getBlogInfo()}
-	{assign var="request" value=$blog->getBlogRequestGenerator()}
-    <h5>{$post->getTopic()|strip_tags}</h5>
-    <div class="subtitle">
-        {$locale->tr("blog")} <a href="{$request->postPermalink($post)}">{$blog->getBlog()}</a>
+{assign var="blog" value=$post->getBlogInfo()}
+{assign var="request" value=$blog->getBlogRequestGenerator()}
+{assign var="postDate" value=$post->getDateObject()}
+{assign var="postOwner" value=$post->getUserInfo()}	
+{assign var="postCategories" value=$post->getCategories()}
+{assign var="artGlobalCategory" value=$post->getGlobalCategory()} 
+	
+    {if $postOwner->hasPicture()}
+	{assign var=picture value=$postOwner->getPicture()}
+	<div style="border:solid #cccccc 1px;width:58px;height:58px;background:url({$request->resourcePreviewLink($picture)}) no-repeat center" class="postgrav">&nbsp;</div>
+	<!--<img src="{$request->resourcePreviewLink($picture)}" class="postgrav" width="60" height="60" alt="{$postOwner->getUsername()|strip_tags}" />-->
+    {else}
+        <img src="templates/summary/user.gif" class="postgrav" width="60" height="60" alt="{$postOwner->getUsername()|strip_tags}" />
+	
+    {/if}    
+    <h3>
+    	<a href="{$request->postPermalink($post)}">{$post->getTopic()|strip_tags|truncate:60}</a>
+    </h3>
+    	
+    <div class="subtitol">
+    	Publicat a <a href="{$request->postPermalink($post)}">{$blog->getBlog()}</a>{if $artGlobalCategory} | {$locale->tr("category")}: <a href="?op=PostList&amp;globalArticleCategoryId={$artGlobalCategory->getId()}">{$artGlobalCategory->getName()}</a>{/if}
     </div>
+    
     <p>
-        {$post->getText()|strip_tags|truncate:200:"..."}
+        {$post->getText()|strip_tags|truncate:140:"..."}
     </p>
-    <div class="peu">
-
-    {assign var="postCategories" value=$post->getCategories()}
-    {assign var="postOwner" value=$post->getUserInfo()}
-    {assign var="postDate" value=$post->getDateObject()}
-        <a href="{$request->postPermalink($post)}" class="noborder">
-        <img src="imgs/post.png" width="10" height="11" alt="Permalink" /></a>
-        &nbsp;{$locale->tr("posted_by")} {$postOwner->getUsername()},  {$locale->formatDate($postDate,"%e %B %Y %H:%M")} |
-        <img src="imgs/comment.png" width="11" height="10" alt="{$locale->tr("comments")}" />&nbsp;
+    
+    <div class="peunoti">
+        <img src="imgs/post.png" width="10" height="11" alt="Autor" />
+         Escrit per <strong>{$postOwner->getUsername()}</strong> el {$locale->formatDate($postDate,"%e %B %Y")} |
+        <img src="imgs/comment.png" width="11" height="10" alt="{$locale->tr("comments")}" />
         <a href="{$request->postPermalink($post)}#comments">{if $post->getTotalComments() eq 0}{$locale->tr("comment on this")}{else}{$post->getTotalComments()} {$locale->tr("comments")|capitalize}{/if}</a>
-        <br style="clear: both;" />
     </div>
+    
+    <div class="clearleft">&nbsp;</div>

Modified: plog/trunk/templates/summary/postslist.template
===================================================================
--- plog/trunk/templates/summary/postslist.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/postslist.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,45 +1,81 @@
-{include file="summary/header.template" section=$locale->tr("blogs")}
+{include file="summary/header.template" selected="postlist" columns=1}
+
 <div id="onecolumn">
-    <div id="intro">
-	<h4>{$locale->tr("global_article_categories")}</h4>
-	<span class="tag">
-	{if $globalArticleCategoryId != 0}
-	<a href="?op=PostList&amp;globalArticleCategoryId=0">{$locale->tr("all")}</a>
-	{else}
-	{$locale->tr("all")}	
-	{/if}
-	</span>
-	{foreach from=$globalArticleCategories item=globalArticleCategory}
-		{math assign=fontSize equation="(int)((x-y)/step)+12" x=$globalArticleCategory->getNumActiveArticles() y=$min step=$step}
-		<span class="tag">
-		{if $globalArticleCategoryId != $globalArticleCategory->getId()}
-		<a style="font-size: {$fontSize}px" href="?op=PostList&amp;globalArticleCategoryId={$globalArticleCategory->getId()}">{$globalArticleCategory->getName()}</a>
-		{else}
-		<span style="font-size: {$fontSize}px">{$globalArticleCategory->getName()}</span>
-		{/if}
-		</span>		
-	{/foreach}
-    </div>
+
     {if empty($currentGlobalArticleCategory)}
-   	  <h4>{$locale->tr("all")}
+      <h2>{$locale->tr("all")}
 		{if $recentPosts}
 		  <a href="{$url->getRssUrl()}?summary=1&amp;type=postslist">
 			<img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" />
 		  </a>
 		{/if}
-      </h4>
+      </h2>
     {else}
-      <h4>{$currentGlobalArticleCategory->getName()} ({$numRecentPosts})
+      <h2>{$currentGlobalArticleCategory->getName()} ({$numRecentPosts})
 		{if $recentPosts}
 	      <a href="{$url->getRssUrl()}?summary=1&amp;type=postslist&amp;globalArticleCategoryId={$currentGlobalArticleCategory->getId()}">
 		    <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" />
 		  </a>
 		{/if}
-      </h4>
+      </h2>
     {/if}
+    
+    
+    <div id="boxes">
+    
+    <div id="cercador">
+<form id="searchForm" method="post" action="{$smarty.server.PHP_SELF}">
+<div>
+            <label for="searchTerms"><input type="text" tabindex="1" name="searchTerms" id="searchTerms" value="" size="14" /></label>
+        <input type="hidden" name="searchType" id="searchType" value="1" />     
+        <input type="hidden" name="op" value="summarySearch" />            
+        <input type="submit" class="button" name="summarySearch" value="Cercar articles" tabindex="21" />
+    </div>
+    </form>
+    
+</div>
+    
+    
+    <div id="categories"><h3>{$locale->tr("global_article_categories")}</h3>
+	<ul>
+	<li>
+	{if $globalArticleCategoryId != 0}
+	<a href="?op=PostList&amp;globalArticleCategoryId=0">{$locale->tr("all")}</a>
+	{else}
+	{$locale->tr("all")}	
+	{/if}
+	</li>
+	
+	{foreach from=$globalArticleCategories item=globalArticleCategory}
+	{if $globalArticleCategory->getNumActiveArticles() > 0}
+		{math assign=fontSize equation="(int)((x-y)/step)+12" x=$globalArticleCategory->getNumActiveArticles() y=$min step=$step}
+		<li>
+		{if $globalArticleCategoryId != $globalArticleCategory->getId()}
+		<a style="font-size: {$fontSize}px" href="?op=PostList&amp;globalArticleCategoryId={$globalArticleCategory->getId()}">{$globalArticleCategory->getName()}</a>
+		{else}
+		<span style="font-size: {$fontSize}px">{$globalArticleCategory->getName()}</span>
+		{/if}
+			
+	
+	</li>
+{/if}
+{/foreach}
+</ul> 
+</div>
+</div>
+
+    
+    
+    
 	{foreach from=$recentPosts item=post}
 	 {include file="summary/post.template"}
 	{/foreach}
-  {pager style=links}
+
+{pager style="links"}
+  
 </div>
 {include file="summary/footer.template"}
+    
+    
+    
+        

Modified: plog/trunk/templates/summary/recent.template
===================================================================
--- plog/trunk/templates/summary/recent.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/recent.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,27 +1,11 @@
-<h4>{$locale->tr("summary_latest_posts")} (
-  {if empty($currentGlobalArticleCategory)}
-   	{$locale->tr("all")}
-  {else}
-   	{$currentGlobalArticleCategory->getName()}
-  {/if})
-  {if $currentGlobalArticleCategory}
-    {assign var=globalArticleCategoryId value=$currentGlobalArticleCategory->getId()}
-    {assign var=posts value=$summaryStats->getRecentArticles($globalArticleCategoryId)}
-  {else}
-    {assign var=posts value=$summaryStats->getRecentArticles()}
-  {/if}  
+<h2>{$locale->tr("summary_latest_posts")}
+{assign var=posts value=$summaryStats->getRecentArticles()}
   {if $posts}
-    {if $currentGlobalArticleCategory}
-      <a href="{$url->getRssUrl()}?summary=1&amp;globalArticleCategoryId={$globalArticleCategoryId}">
+          <a href="{$url->getRssUrl()}?summary=1">
         <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" />
       </a>
-    {else}
-      <a href="{$url->getRssUrl()}?summary=1">
-        <img src="{$url->getUrl("/imgs/rss_logo_small.gif")}" alt="RSS" />
-      </a>
-    {/if}    
   {/if}
-</h4>
+</h2>
 {foreach from=$posts item=post}
  {include file="summary/post.template"}
 {/foreach}

Modified: plog/trunk/templates/summary/registerstep0.template
===================================================================
--- plog/trunk/templates/summary/registerstep0.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/registerstep0.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,20 +1,34 @@
-{include file="summary/header.template" section=$locale->tr("register_step0_title")}
+{include file="summary/header.template" selected="register" columns=1}
+
+<div id="onecolumn">
+ <h2>Creació de bloc (0)</h2>
+ <div id="intro">
+<p>
+   Mitjançant aquest procés de registre podràs disposar del teu propi bloc, de forma immediata. Primer has de llegir i acceptar les condicions. Per completar el procés és necessari que el teu navegador tingui habilitades les cookies.
+  </p>
+  </div>
+  
+<div id="registrationform">
+
+
+
 <form action="register.php" method="post">
-  <fieldset class="inputField">
-   <legend>{$locale->tr("agreement")}</legend>
+  <fieldset>
+   <legend>Acceptació de les condicions</legend>
    <div class="field">
     <!--user aggreement-->
-    <label for="contract">{$locale->tr("read_service_agreement")}</label>
-    <div class="formHelp"></div>
-    <textarea name="contract" class="contract" readonly="readonly" style="width:99%" rows="15">
+    <label for="contract">Condicions</label>
+    <textarea name="contract" id="contract" readonly="readonly" cols="40" rows="10">
 {include file="summary/agreement.template"}
     </textarea>
     <!--end user agreement-->
    </div>
   </fieldset>
   <div class="buttons">
-   <input type="button" value="{$locale->tr("decline")}" name="decline"  onclick="window.location.href='summary.php'" />
-   <input type="submit" value="{$locale->tr("accept")}" name="accept"/>
+   <input type="button" value="Rebuig les condicions" name="decline"  onclick="window.location.href='summary.php'" />
+   <input type="submit" value="Accept les condicions" name="accept"/>
   </div>
  </form>
+ </div>
+ </div>
 {include file="summary/footer.template"}

Modified: plog/trunk/templates/summary/registerstep1.template
===================================================================
--- plog/trunk/templates/summary/registerstep1.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/registerstep1.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,64 +1,81 @@
-{include file="summary/header.template" section=$locale->tr("register_step1_title")}
-  <script type="text/javascript" src="js/prototype/prototype.js"></script>
-  <script type="text/javascript" src="js/ui/summary.js"></script>
-  <script type="text/javascript">
-  	var successCheckUserNameMessage = "{$locale->tr("check_username_ok")}";
-  	var errorCheckUserNameMessage = "{$locale->tr("error_username_exist")}";
-  	var emptyUserNameMessage = "{$locale->tr("error_empty_name")}";
-  </script>
-  <form name="newUser" action="register.php" method="post">
-    <fieldset class="inputField">
-        <legend>{$locale->tr("step1")}</legend>
-        <p>
-          {$locale->tr("register_step1_help")}
-        </p>
-        {include file="summary/formvalidate.template" message=$locale->tr("error_adding_user")}
-        <div class="field">
-            <label for="userName">{$locale->tr("username")}</label>
-			<span class="required">*</span>
-			<div class="formHelp">{$locale->tr("username_help")}</div>
-            <input type="text" name="userName" value="{$userName}" id="userName" style="width: 73%;" maxlength="15" />
-            <input type="button" name="checkUserName" value="{$locale->tr("check_username")}" style="width: 25%;" onclick="javascript:checkUserNameAjax();">
-            <div id="checkResult" style="display: none"></div>
-            {include file="summary/validate.template" field=userName message=$locale->tr("error_incorrect_username")}
-        </div>
-        <div class="field">
-            <label for="userFullName">{$locale->tr("full_name")}</label>
-			<span class="required">*</span>
-            <div class="formHelp">{$locale->tr("full_name_help")}</div>
-            <input type="text" name="userFullName" value="{$userFullName}" id="userFullName" />
-        </div>
-        <div class="field">
-            <label for="userPassword">{$locale->tr("password")}</label>
-			<span class="required">*</span>
-            <input type="password" name="userPassword" id="userPassword" value="{$userPassword}"/>
-            {include file="summary/validate.template" field=userPassword message=$locale->tr("error_invalid_password")}
-            <label for="userPasswordCheck">
-                 {$locale->tr("confirm_password")}</label>
-              <span class="required">*</span>
-            <input type="password" name="userPasswordCheck" id="userPasswordCheck" value="{$userPasswordCheck}"/>
-            {include file="summary/validate.template" field=userPasswordCheck message=$locale->tr("error_passwords_dont_match")}
-        </div>
-        <div class="field">
-            <label for="userPasswordCheck">{$locale->tr("email")}</label>
-			<span class="required">*</span>
-			<div class="formHelp">{$locale->tr("email_help")}</div>
-            <input type="text" name="userEmail" id="userEmail" value="{$userEmail}" />
-            {include file="summary/validate.template" field=userEmail message=$locale->tr("error_incorrect_email_address")}
-        </div>
-        {if $useCaptchaAuth}
-        <div class="field">
-            <label for="userAuth">{$locale->tr("auth_img")}</label>
-            <span class="required">*</span>
-            <div class="formHelp">{$locale->tr("auth_img_help")}</div>
-            <img src="{$userAuthImgPath}" alt="CAPTCHA" />
-            <input type="text" name="userAuth" id="userAuth" value="" />
-            {include file="summary/validate.template" field=userAuth message=$locale->tr("error_incorrect_auth_img")}
-        </div>
-        {/if}
-    </fieldset>
-    <div class="buttons">
-      <input type="submit"  value="{$locale->tr("register_next")} &raquo;" name="Register"/>
-    </div>
-  </form>
-{include file="summary/footer.template"}
+{include file="summary/header.template" selected="register" columns=1}
+
+  <script type="text/javascript" src="js/prototype/prototype.js"></script>
+  <script type="text/javascript" src="js/ui/summary.js"></script>
+  <script type="text/javascript">
+  	var successCheckUserNameMessage = "{$locale->tr("check_username_ok")}";
+  	var errorCheckUserNameMessage = "{$locale->tr("error_username_exist")}";
+  	var emptyUserNameMessage = "{$locale->tr("error_empty_name")}";
+  </script>
+  
+  
+  <div id="onecolumn">
+ <h2>Creació de bloc (1)</h2>
+ <div id="intro">
+        <p>
+          {$locale->tr("register_step1_help")}
+        </p>
+  </div>
+  
+<div id="registrationform">
+  
+  
+  
+  <form name="newUser" id="newUser" action="register.php" method="post">
+    <fieldset>
+        <legend>{$locale->tr("step1")}</legend>
+
+        {include file="summary/formvalidate.template" message=$locale->tr("error_adding_user")}
+        
+        <div class="field">
+            <label for="userName">{$locale->tr("username")}</label>
+			<div class="formHelp">{$locale->tr("username_help")}</div>
+            <input type="text" name="userName" value="{$userName}" id="userName" size="12" />
+            <input type="button" id="checkUserName" name="checkUserName" value="{$locale->tr("check_username")}" onclick="javascript:checkUserNameAjax();">
+            <div id="checkResult" style="display: none"></div>
+            {include file="summary/validate.template" field=userName message=$locale->tr("error_incorrect_username")}
+        </div>
+        
+        <div class="field">
+            <label for="userFullName">{$locale->tr("full_name")}</label>
+            <div class="formHelp">{$locale->tr("full_name_help")}</div>
+            <input type="text" name="userFullName" value="{$userFullName}" id="userFullName" size="40" />
+        </div>
+        
+        <div class="field">
+            <label for="userPassword">{$locale->tr("password")}</label>
+            <input type="password" name="userPassword" id="userPassword" value="{$userPassword}" size="12" />
+            {include file="summary/validate.template" field=userPassword message=$locale->tr("error_invalid_password")}
+            <label for="userPasswordCheck">
+                 {$locale->tr("confirm_password")}</label>
+            <input type="password" name="userPasswordCheck" id="userPasswordCheck" value="{$userPasswordCheck}" size="12" />
+            {include file="summary/validate.template" field=userPasswordCheck message=$locale->tr("error_passwords_dont_match")}
+        </div>
+        
+        <div class="field">
+            <label for="userPasswordCheck">{$locale->tr("email")}</label>
+			<div class="formHelp">{$locale->tr("email_help")}</div>
+            <input type="text" name="userEmail" id="userEmail" value="{$userEmail}" size="40" />
+            {include file="summary/validate.template" field=userEmail message=$locale->tr("error_incorrect_email_address")}
+        </div>
+        
+        {if $useCaptchaAuth}
+        <div class="field">
+            <label for="userAuth">{$locale->tr("auth_img")}</label>
+            <div class="formHelp">{$locale->tr("auth_img_help")}</div>
+            <img src="{$userAuthImgPath}" alt="CAPTCHA" />
+            <input type="text" name="userAuth" id="userAuth" value="" size="12" />
+            {include file="summary/validate.template" field=userAuth message=$locale->tr("error_incorrect_auth_img")}
+        </div>
+        {/if}
+        
+    </fieldset>
+    
+    
+    <div class="buttons">
+      <input type="submit"  value="{$locale->tr("register_next")} &raquo;" name="Register"/>
+    </div>
+  </form>
+ </div>
+ </div>
+{include file="summary/footer.template"}

Modified: plog/trunk/templates/summary/registerstep2.template
===================================================================
--- plog/trunk/templates/summary/registerstep2.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/registerstep2.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,32 +1,37 @@
-{include file="summary/header.template" section=$locale->tr("register_step2_title")}
+{include file="summary/header.template" selected="register" columns=1}
+
+
+  <div id="onecolumn">
+ <h2>Creació de bloc (2)</h2>
+ <div id="intro">
+        <p>
+          {$locale->tr("register_step2_help")}
+        </p>
+  </div>
+  
+<div id="registrationform">
+
+
  <form name="createBlog" action="register.php" method="post">
   <fieldset class="inputField">
    <legend>{$locale->tr("step2")}</legend>
    {include file="summary/formvalidate.template" message=$locale->tr("error_adding_blog")}     
    <div class="field">
      <label for="blogName">{$locale->tr("name")}</label>
-     <span class="required">*</span>
      <div class="formHelp">{$locale->tr("register_blog_name_help")}</div>
-     <input type="text" name="blogName" value="{$blogName}" id="blogName" />
+     <input type="text" name="blogName" value="{$blogName}" id="blogName" size="40" />
      {include file="summary/validate.template" field=blogName message=$locale->tr("error_empty_name")}
    </div>
 
    {if $blogDomainsEnabled}
    <div class="field">
      <label for="blogSubDomain">{$locale->tr("domain")}</label>
-	 <span class="required">*</span>
-     <div class="formHelp">{$locale->tr("register_blog_domain_help")}</div>
-     <input type="text" name="blogSubDomain" id="blogSubDomain" style="width:150px" value="{$blogSubDomain}" />
+     <div class="formHelp">{$locale->tr("register_blog_domain_help")}. Si vols emprar el teu propi domini, contacta amb l'administrador</div>
+     <input type="text" name="blogSubDomain" id="blogSubDomain" value="{$blogSubDomain}"  size="12" />
      <select name="blogMainDomain" id="blogMainDomain">
-      {foreach from=$blogAvailableDomains item=domain}
-       <option value="{$domain}" {if $domain == $blogMainDomain}selected{/if}>
-            {if $domain == "?"}
-              {$locale->tr("subdomains_any_domain")}
-            {else}
-              .{$domain}
-            {/if}
+            <option value="balearweb.net" selected >
+            .balearweb.net
        </option>
-      {/foreach}
      </select>
      {include file="summary/validate.template" field=blogSubDomain message=$locale->tr("error_invalid_subdomain")}
      {include file="summary/validate.template" field=blogMainDomain message=$locale->tr("error_invalid_domain")}
@@ -35,7 +40,6 @@
 
    <div class="field">
      <label for="blogCategoryId">{$locale->tr("blog_category")}</label>
-     <span class="required">*</span>
      <div class="formHelp">{$locale->tr("blog_category_help")}</div>
      <select name="blogCategoryId" id="blogCategoryId">
       {foreach name=blogCategories from=$blogCategories item=blogCategory}
@@ -46,7 +50,6 @@
 
    <div class="field">
      <label for="blogLocale">{$locale->tr("language")}</label>
-     <span class="required">*</span>
      <div class="formHelp">{$locale->tr("blog_language_help")}</div>
      <select name="blogLocale" id="blogLocale">
       {foreach from=$locales item=localeObject}
@@ -59,4 +62,7 @@
     <input type="submit" name="{$locale->tr("register_next")}" value="{$locale->tr("register_next")} &raquo;"/>
   </div>  
  </form>
-{include file="summary/footer.template"}
+
+</div>
+</div>
+{include file="summary/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/registerstep3.template
===================================================================
--- plog/trunk/templates/summary/registerstep3.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/registerstep3.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,28 +1,30 @@
-{include file="summary/header.template" section=$locale->tr("register_step3_title")}
+{include file="summary/header.template" selected="register" columns=1}
 
-{literal}
-<script language="JavaScript" type="text/JavaScript">
-function openWindow(URL,windowtitle,params) { 
-  window.open(URL,windowtitle,params);
-}
-</script>
-{/literal}
 
+  <div id="onecolumn">
+ <h2>Creació de bloc (3)</h2>
+ <div id="intro">
+        <p>
+          {$locale->tr("register_step3_help")}
+        </p>
+  </div>
+  
+<div id="registrationform">
+
  <form name="templateChooser" method="post">
   <fieldset class="inputField">
    <legend>{$locale->tr("step3")}</legend>
    <div class="field">
 	<label for="">{$locale->tr("select_template")}</label>
-	<div class="formHelp">{$locale->tr("register_step3_help")}</div>
+
     {include file="summary/validate.template" field=templateId message=$locale->tr("error_must_choose_template")}	
     {foreach from=$templates item=template}
      {assign var=templateName value=$template->getName()}
      <div class="templateScreen">
-     <a href="javascript:openWindow('{$template->getScreenshotUrl()}','Screenshot','scrollbars=yes,resizable=yes,width=400,height=300');"><img src="{$template->getScreenshotUrl()}" alt="{$templateName}" height="150" width="200" /></a><br/>
+     <div><img src="{$template->getScreenshotUrl()}" alt="{$templateName}" height="200" width="280" /></div>
      <input type="radio" class="checkbox" value="{$template->getName()}" name="templateId" id="templateId" />
      <label for="templateId"><strong>{$templateName}</strong></label>
-     <br/><br/>
-     </div>
+      </div>
     {/foreach}
    </div>
   </fieldset>  
@@ -30,4 +32,7 @@
     <input type="submit" name="{$locale->tr("register_next")}" value="{$locale->tr("register_next")} &raquo;"/>
   </div>  
  </form>
+</div>
+</div>
 {include file="summary/footer.template"}
+

Modified: plog/trunk/templates/summary/registerstep4.template
===================================================================
--- plog/trunk/templates/summary/registerstep4.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/registerstep4.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,6 +1,15 @@
-{include file="summary/header.template" section=$locale->tr("register_new_blog_step4_title")}
-   {$locale->tr("register_new_blog_step4_description")}
-<div id="onecolumn">
+{include file="summary/header.template" selected="register" columns=1}
+
+
+  <div id="onecolumn">
+ <h2>Creació de bloc</h2>
+ <div id="intro">
+        <p>
+          {$locale->tr("register_step3_help")}
+        </p>
+  </div>
+  
+<div id="registrationform">
  <form name="createBlog" action="register.php" method="post">
   <fieldset class="inputField">
    <legend>{$locale->tr("step4")}</legend>
@@ -45,17 +54,8 @@
   <div class="buttons">
    <input type="submit" name="done" value="{$locale->tr("create")}" />
   </div>
-
-   <input type="hidden" name="userName" value="{$userName}"/>
-   <input type="hidden" name="blogDomain" value="{$blogDomain}"/>
-   <input type="hidden" name="userFullName" value="{$userFullName}"/>
-   <input type="hidden" name="userPassword" value="{$userPassword}"/>
-   <input type="hidden" name="userEmail" value="{$userEmail}"/>
-   <input type="hidden" name="blogName" value="{$blogName}"/>
-   <input type="hidden" name="blogCategoryId" value="{$blogCategoryId}"/>
-   <input type="hidden" name="blogLocale" value="{$blogLocale}"/>
-   <input type="hidden" name="templateId" value="{$templateId}"/>
  </form> 
 
 </div>
-{include file="summary/footer.template"}
+</div>
+{include file="summary/footer.template"}
\ No newline at end of file

Modified: plog/trunk/templates/summary/registerstep5.template
===================================================================
--- plog/trunk/templates/summary/registerstep5.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/registerstep5.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,5 +1,7 @@
-{include file="summary/header.template" section=$locale->tr("register_step5_title")}
-<div id="onecolumn">
+{include file="summary/header.template" selected="register" columns=1}
+  <div id="onecolumn">
+ <h2>Creació de bloc</h2>
+<div id="registrationform">
  <form name="formDone" action="summary.php" method="post"> 
   <fieldset class="inputField">
    <p>
@@ -23,4 +25,5 @@
   </div>
  </form> 
 </div>
+</div>
 {include file="summary/footer.template"}

Modified: plog/trunk/templates/summary/resource.template
===================================================================
--- plog/trunk/templates/summary/resource.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/resource.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -32,4 +32,4 @@
    		{if $counter%3 == 0}
    		{/if}
      <p><a href="{$request->blogLink()}">{$blog->getBlog()}</a></p>
-  	</div>
\ No newline at end of file
+  	</div>

Modified: plog/trunk/templates/summary/searchresults.template
===================================================================
--- plog/trunk/templates/summary/searchresults.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/searchresults.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -1,5 +1,6 @@
 {include file="summary/header.template" section=$locale->tr("search_results")}
 <div id="onecolumn">
+    <h2>Resultats de la recerca</h2>
     {if $searchtype == 1}
 	    {foreach from=$searchresults item=result}
 		    {assign var="post" value=$result->getArticle()}

Modified: plog/trunk/templates/summary/userlist.template
===================================================================
--- plog/trunk/templates/summary/userlist.template	2006-12-29 14:40:51 UTC (rev 4449)
+++ plog/trunk/templates/summary/userlist.template	2006-12-29 14:44:40 UTC (rev 4450)
@@ -11,6 +11,6 @@
 		 {/foreach}
 		</p>
     {/foreach}
-	{pager style=list}
+  {pager style=list}
 </div>
 {include file="summary/footer.template"}



More information about the pLog-svn mailing list