[commits] r161 - in selinux-site/trunk/selinux.theme/selinux/theme: browser skins/selinux_templates

[jens at mail.se.linux.org]

Author: jens
Date: 2007-12-10 23:10:00 +0100 (Mon, 10 Dec 2007)
New Revision: 161

Modified:
   selinux-site/trunk/selinux.theme/selinux/theme/browser/footer.pt
   selinux-site/trunk/selinux.theme/selinux/theme/skins/selinux_templates/personalize_form.cpt
Log:
Change link for cookies and license, help texts in personalize_form


Modified: selinux-site/trunk/selinux.theme/selinux/theme/browser/footer.pt
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/browser/footer.pt	2007-12-10 08:50:05 UTC (rev 160)
+++ selinux-site/trunk/selinux.theme/selinux/theme/browser/footer.pt	2007-12-10 22:10:00 UTC (rev 161)
@@ -31,8 +31,10 @@
 </a>
 </p>
 <p>
-<a href="/arbetsgrupper/webb/kakor">Information om kakor</a><br />
-<a href="/arbetsgrupper/webb/licens">Copyright 2003–2007 Svenska Linuxföreningen.</a> Kontakta oss på info at se.linux.org.<br />
+<a href="/om/cookies-copyright">Copyright 
+2003-2008 Svenska Linuxföreninen samt information om webbplatsen 
+anvÃndning av kakor</a>
+Kontakta oss påinfo at se.linux.org.<br />
 </p>
 
 </div>

Modified: selinux-site/trunk/selinux.theme/selinux/theme/skins/selinux_templates/personalize_form.cpt
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/skins/selinux_templates/personalize_form.cpt	2007-12-10 08:50:05 UTC (rev 160)
+++ selinux-site/trunk/selinux.theme/selinux/theme/skins/selinux_templates/personalize_form.cpt	2007-12-10 22:10:00 UTC (rev 161)
@@ -92,8 +92,12 @@
 					    givenname python:request.get('givenname', member.getProperty('givenname', ''));"
 				tal:attributes="class python:test(error, 'field error', 'field')">
 
-			<label for="givenname" i18n:translate="label_givenname">Förnamn</label>
+			<label for="givenname" i18n:translate="label_givenname">F&ouml;rnamn</label>
 
+                            <div class="formHelp">
+                            Ange ditt f&ouml;rnamn.
+                            </div>
+
 			<div tal:content="error">Validation error output</div>
 
 				<input type="text"
@@ -114,6 +118,8 @@
 
 			<label for="surname" i18n:translate="label_surname">Efternamn</label>
 
+			<div class="formHelp">Ange ditt efternamn.</div>
+
 			<div tal:content="error">Validation error output</div>
 
 				<input type="text"
@@ -134,12 +140,17 @@
 
 			<label for="email" i18n:translate="label_email">Email</label>
 
+                            <div class="formHelp">
+                            Ange din e-postadress. Den adress du anger h&auml;r kommer ta emot epost till anv&auml;rnamn at se.linux.org 
+			    samt anv&auml;ndas till utskick fr&aring;n f&ouml;reningen till alla medlemmar.
+                            </div>
+
 			<div tal:content="error">Validation error output</div>
 
 				<input type="text"
 					id="email"
 					name="email"
-					size="25"
+					size="30"
 					value="member.email html_quote"
 					tal:attributes="value email;
 							disabled python:member.canWriteProperty('email') and default or 'disabled'"
@@ -149,10 +160,6 @@
                         <tal:macro condition="showAfterPrimary">
                             <div metal:use-macro="after_primary"/>
                         </tal:macro>
-                        
-                        <tal:macro condition="showAfterPrimary">
-                            <div metal:use-macro="after_primary"/>
-                        </tal:macro>
 
 			<div class="field"
 				tal:define="error errors/postadress | nothing;
@@ -161,6 +168,10 @@
 
 			<label for="postadress" i18n:translate="label_postadress">Postadress</label>
 
+                            <div class="formHelp">
+                            Ange din adress, allts&aring; gatuadress. Exempel: Kryddstigen 14B.
+                            </div>
+
 			<div tal:content="error">Validation error output</div>
 
 				<input type="text"
@@ -181,12 +192,16 @@
 
 			<label for="postnr" i18n:translate="label_postnr">Postnummer</label>
 
+                            <div class="formHelp">
+                            Ange ditt postnummer, enbart siffror. Exempel: 12345.
+                            </div>
+
 			<div tal:content="error">Validation error output</div>
 
 				<input type="text"
 					id="postnr"
 					name="postnr"
-					size="25"
+					size="5"
 					value="member.postnr html_quote"
 					tal:attributes="value postnr;
 							disabled python:member.canWriteProperty('postnr') and default or 'disabled'"
@@ -201,6 +216,10 @@
 
 			<label for="location" i18n:translate="label_location">Ort</label>
 
+                            <div class="formHelp">
+                            Ange din postort, till exempel Karlstad.
+                            </div>
+
 			<div tal:content="error">Validation error output</div>
 
 				<input type="text"
@@ -221,6 +240,8 @@
 
 			<label for="telenr" i18n:translate="label_telenr">Telefonnummer</label>
 
+			<div class="formHelp">Om du vill kan du ange ditt telefonnummer h&auml;r.</div>
+
 			<div tal:content="error">Validation error output</div>
 
 				<input type="text"
@@ -241,6 +262,8 @@
 
 			<label for="mobile" i18n:translate="label_mobile">Mobiltelefonnummer</label>
 
+			<div class="formHelp">Om du vill kan du ange ditt mobiltelefonnummer h&auml;r.</div>
+
 			<div tal:content="error">Validation error output</div>
 
 				<input type="text"
@@ -322,7 +345,7 @@
                             <input type="text"
                                    id="home_page"
                                    name="home_page"
-                                   size="25"
+                                   size="50"
                                    value="member.home_page html_quote"
                                    tal:attributes="value home_page;
                                                    disabled python:member.canWriteProperty('home_page') and default or 'disabled'"