Fix issue 03613: bgcolor entered into HTML and thus not editable via …

…CSS in templates Dev Move inline styles to template.css and clean up HTML git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@9260 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 16, 2010 · 501b7ba · 501b7ba
1 parent b6d6daa
commit 501b7ba
Show file tree

Hide file tree

Showing 38 changed files with 937 additions and 344 deletions.
diff --git a/templates/basic/surveylist.pstpl b/templates/basic/surveylist.pstpl
@@ -29,7 +29,7 @@
 		<td class="language-changer">
 			<p>{LANGUAGECHANGER}</p>
 			<a href="http://www.limesurvey.org" target="_blank"><img src="{TEMPLATEURL}limesurvey_logo.png" border="0" title="LimeSurvey" /></a><br /><br />
-			<a href="http://www.limesurvey.org" target="_blank"><font color="#000000">The Online Survey Tool</font></a> - Free & Open Source<br />
+			<a href="http://www.limesurvey.org" target="_blank">The Online Survey Tool</a> - Free & Open Source<br />
 		</td>
 	</tr>
 </table>
diff --git a/templates/basic/template.css b/templates/basic/template.css
@@ -310,12 +310,25 @@ table.question tr.array1:hover,table.question tr.array2:hover {
 .survey-list-table .survey-list {
 }
 
+.survey-list-table .survey-list ul {
+	padding: 0;
+}
+
+.survey-list-table .survey-list li {
+	list-style: none;
+	padding-bottom: 5px;
+}
+
 .survey-list-table .survey-contact {
 }
 
 .survey-list-table .language-changer {
 }
 
+.survey-list-table .language-changer a {
+	color: #000000;
+}
+
 .register-message-1 {
 	font-weight: bold;
 }

diff --git a/templates/bluengrey/surveylist.pstpl b/templates/bluengrey/surveylist.pstpl
@@ -12,13 +12,13 @@
 				{SURVEYLIST}
 			</ul>
 		</div>
-    	<p>
+    	<p class="survey-contact">
 			{SURVEYCONTACT}
 		</p>
     	<p>
 			{LANGUAGECHANGER}
 		</p>
-    	<p>
+    	<p class="language-changer">
 			<a href="http://www.limesurvey.org" target="_blank"><img src="{TEMPLATEURL}limesurvey_logo.png" border="0" title="LimeSurvey" /></a><br />
 			<a href="http://www.limesurvey.org" target="_blank"><font color="#000000">The Online Survey Tool</font></a> - Free & Open Source<br />
 		</p>

diff --git a/templates/bluengrey/template.css b/templates/bluengrey/template.css
@@ -450,6 +450,25 @@ td.clearall-result .warning-text {
 .save-form{
 }
 
+#listingContent .survey-contact {
+}
+
+#listingContent .language-changer {
+}
+
+#listingContent .language-changer a {
+	color: #000000;
+}
+
+#listingList ul {
+	padding: 0;
+}
+
+#listingList li {
+	list-style: none;
+	padding-bottom: 5px;
+}
+
 
 /* -------------------------------------------------
    START: Question styles  ------------------------- */

diff --git a/templates/business_grey/surveylist.pstpl b/templates/business_grey/surveylist.pstpl
@@ -1,16 +1,16 @@
-<table width="100%" align="center" cellspacing="0">
+<table class="survey-list-table">
     <tr>
-            <td align="center" bgcolor="#FFFFFF">
-             <p><font face="verdana" size="4" color="#328639"><strong>{SITENAME}</strong></font></p>
-            </td>
+		<td class="site-name">
+			 <p>{SITENAME}</p>
+		</td>
     </tr>
 	<tr>
-		<td align="center" bgcolor="#FFFFFF">
-             <strong>{SURVEYLISTHEADING}</strong>
+		<td class="survey-list-heading">
+             {SURVEYLISTHEADING}
          </td>
     </tr>
 	<tr>
-		<td align="center" bgcolor="#FFFFFF">
+		<td class="survey-list">
              <table align="center">
                <tr>
                 <td>
@@ -21,15 +21,15 @@
 		</td>
 	</tr>
       <tr>
-            <td align="center" bgcolor="#FFFFFF">
-             {SURVEYCONTACT}
-            </td>
+		<td class="survey-contact">
+		 {SURVEYCONTACT}
+		</td>
       </tr>
       <tr>
-            <td align="center" height="100px" bgcolor="#FFFFFF" valign="bottom">
+          <td class="language-changer">
              <p>{LANGUAGECHANGER}</p>
              <a href="http://www.limesurvey.org" target="_blank"><img src="{TEMPLATEURL}limesurvey_logo.png" border="0" title="LimeSurvey" /></a><br />
-             <a href="http://www.limesurvey.org" target="_blank"><font color="#000000">The Online Survey Tool</font></a> - Free & Open Source<br />
-            </td>
+             <a href="http://www.limesurvey.org" target="_blank">The Online Survey Tool</a> - Free & Open Source<br />
+          </td>
       </tr>
 </table>
diff --git a/templates/business_grey/template.css b/templates/business_grey/template.css
@@ -380,6 +380,53 @@ td.clearall-result {
 .save-form{
 }
 
+.survey-list-table {
+	width: 100%;
+	margin: 0 auto;
+	border-collapse: collapse;
+	background-color: #FFFFFF;
+}
+
+.survey-list-table td {
+	text-align: center;
+}
+
+.survey-list-table .site-name {
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	font-size: large;
+	color: #328639;
+}
+
+.survey-list-table .survey-list-heading {
+	font-weight: bold;
+}
+
+.survey-list-table .survey-list {
+}
+
+.survey-list-table .survey-list ul {
+	padding: 0;
+}
+
+.survey-list-table .survey-list li {
+	list-style: none;
+	padding-bottom: 5px;
+}
+
+.survey-list-table .survey-contact {
+}
+
+.survey-list-table .language-changer {
+	height: 100px;
+	vertical-align: bottom;
+	padding-bottom: 10px;
+}
+
+.survey-list-table .language-changer a {
+	color: #000000;
+}
+
 
 
 /* -------------------------------------------------

diff --git a/templates/clear_logo/assessment.pstpl b/templates/clear_logo/assessment.pstpl
@@ -1,13 +1,13 @@
 <br />
-<table align="center" width="75%" border="1" style="border-collapse: collapse" bordercolor="#111111">
- <tr>
-  <td bgcolor="#8fe0dd" align="center"><font size="2">
-   <strong>{ASSESSMENT_HEADING}</strong></font>
-  </td>
- </tr>
- <tr>
-  <td>
-   {ASSESSMENTS}
-  </td>
- </tr>
+<table class="assessment-table">
+	<tr>
+		<td class="assessment-heading">
+			{ASSESSMENT_HEADING}
+		</td>
+	</tr>
+	<tr>
+		<td class="assessments">
+			{ASSESSMENTS}
+		</td>
+	</tr>
 </table>
diff --git a/templates/clear_logo/clearall.pstpl b/templates/clear_logo/clearall.pstpl
@@ -1,13 +1,12 @@
 <br />
- <table align="center" cellpadding="30">
-  <tr>
-   <td align="center" bgcolor="efe5ca">
-    <font face="arial" size="2">
-    <strong><font color="red">{ANSWERSCLEARED}</font></strong><br /><br />
-	{RESTART}<br />
-        {URL}<br />
-	{CLOSEWINDOW}
-   </td>
-  </tr>
- </table>
+<table align="center" cellpadding="30">
+	<tr>
+		<td class="clearall-result">
+			<span class="warning-text">{ANSWERSCLEARED}</span><br /><br />
+			{RESTART}<br />
+				{URL}<br />
+			{CLOSEWINDOW}
+		</td>
+	</tr>
+</table>
 <br />
diff --git a/templates/clear_logo/completed.pstpl b/templates/clear_logo/completed.pstpl
@@ -1,15 +1,21 @@
-<table width="80%" align="center" class="bf" cellpadding="0" cellspacing="0">
-<tr>
-	<td rowspan="2"><table width="100%" cellspacing="10">
-		<tr>
-			<td>
-<table width="80%" align="center"><tr><td>
-
-{COMPLETED}
-
-<p>{URL}<p>
-
-<center><input type="button" name="closeme" value="Close Window" onClick="top.window.close();"></center>
-
-
-</td></tr></table>
+<table class="completed-table bf">
+	<tr>
+		<td>
+			<table width="80%" align="center">
+				<tr>
+					<td class="completed-text">
+						{COMPLETED}<br /><br />
+						<span>{URL}</span><br /><br />
+						<center>
+							<input type="button" name="closeme" value="Close Window" onclick="top.window.close();" />
+						</center>
+					</td>
+				</tr>
+			</table>
+		</td>				
+	</tr>					
+</table>							
+
+
+
+
diff --git a/templates/clear_logo/endpage.pstpl b/templates/clear_logo/endpage.pstpl
@@ -1,13 +0,0 @@
-			</td>
-		</tr>
-	</table>
-	</td>
-	<td width="3" height="3" class="b9"></td>
-</tr>
-<tr><td width="3" class="b3"></td></tr>
-<tr class="b3">
-	<td colspan="2" height="3"><table cellpadding=0 cellspacing=0>
-		<tr><td width="3" height="3" class="b9"></td></tr>
-	</table></td>
-</tr>
-</table>

diff --git a/templates/clear_logo/groupdescription.pstpl b/templates/clear_logo/groupdescription.pstpl
@@ -1 +1 @@
-			<br /><font face="verdana" size="2">{GROUPDESCRIPTION}</font><br /><br />
+			<br />{GROUPDESCRIPTION}<br /><br />
diff --git a/templates/clear_logo/load.pstpl b/templates/clear_logo/load.pstpl
@@ -1,7 +1,7 @@
 <center>
-<font color="red">{LOADERROR}</font>
-<p><strong><font size="+1">{LOADHEADING}</font></strong></p>
-<p>{LOADMESSAGE}</p>
-<p>{LOADFORM}</p>
-{RETURNTOSURVEY}
+<span class="load-error">{LOADERROR}</span>
+<p class="load-heading">{LOADHEADING}</p>
+<p class="load-message">{LOADMESSAGE}</p>
+<p class="load-form">{LOADFORM}</p>
+<span class="return-to-survey">{RETURNTOSURVEY}</span>
 </center>
diff --git a/templates/clear_logo/navigator.pstpl b/templates/clear_logo/navigator.pstpl
@@ -1,7 +1,33 @@
-<table width="100%" align="center" bgcolor="#efe5ca" border="0" cellspacing="0" cellpadding="8">
+						<table class="navigator-table">
+							<tr>
+								<td class="clear-all">
+									{CLEARALL}
+								</td>
+								<td class="save-all">
+									{SAVE}
+								</td>
+								<td class="submit-buttons">
+									{NAVIGATOR}
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td width="3" height="3" class="b9"></td>
+	</tr>
 	<tr>
-		<td align="left" nowrap width="33%">{CLEARALL}</td>
-                <td align="center" nowrap width="33%">{SAVE}</td>
-		<td align="right" nowrap width="33%">{NAVIGATOR}</td>
+		<td width="3" class="b3"></td>
+	</tr>
+	<tr class="b3">
+		<td colspan="2" height="3">
+			<table cellpadding="0" cellspacing="0">
+				<tr>
+					<td width="3" height="3" class="b9">
+					</td>
+				</tr>
+			</table>
+		</td>
 	</tr>
-</table>
+</table>
diff --git a/templates/clear_logo/privacy.pstpl b/templates/clear_logo/privacy.pstpl
@@ -1,5 +1,7 @@
-<table align="center" bgcolor="#efe5ca" width="75%">
-	<tr>
-		<td align="center"><font size="1">{PRIVACYMESSAGE}</font></td>
-	</tr>
-</table>
+						<table class="privacy-message">
+							<tr>
+								<td>
+									{PRIVACYMESSAGE}
+								</td>
+							</tr>
+						</table>
diff --git a/templates/clear_logo/register.pstpl b/templates/clear_logo/register.pstpl
@@ -1,7 +1,13 @@
-<br />
-<center>
-<font color="red"><strong>{REGISTERERROR}</strong></font>
-<p><strong>{REGISTERMESSAGE1}</strong></p>
-<p>{REGISTERMESSAGE2}</p>
-{REGISTERFORM}<br />
-</center>
+						<br />
+						<center>
+						<span class="warning-text">{REGISTERERROR}</span>
+						<p class="register-message-1">{REGISTERMESSAGE1}</p>
+						<p class="register-message-2">{REGISTERMESSAGE2}</p>
+						{REGISTERFORM}<br />
+					</center>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
diff --git a/templates/clear_logo/save.pstpl b/templates/clear_logo/save.pstpl
@@ -1,7 +1,8 @@
 <center>
-<font color="red">{SAVEERROR}</font>
-<p><strong><font size="+1">{SAVEHEADING}</font></strong></p>
-<p>{SAVEMESSAGE}</p>
-<p>{SAVEFORM}</p>
-{RETURNTOSURVEY}
+	<p class="save-error">{SAVEERROR}</p>
+	<p class="save-heading">{SAVEHEADING}</p>
+	<p class="save-message">{SAVEMESSAGE}</p>
+	<div class="save-form">{SAVEFORM}</div>
+	<p class="return-to-survey">{RETURNTOSURVEY}</p>
 </center>
+
diff --git a/templates/clear_logo/startgroup.pstpl b/templates/clear_logo/startgroup.pstpl
@@ -1,4 +1,4 @@
 <table width="100%">
 	<tr>
-		<td align="center">
-			<font face="verdana" size="2" color="#666666"><strong>{GROUPNAME}</strong></font>
+		<td class="group-name">
+			{GROUPNAME}