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@9488 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Nov 16, 2010 · 30b42f7 · 30b42f7
1 parent ad9cbac
commit 30b42f7
Show file tree

Hide file tree

Showing 28 changed files with 442 additions and 155 deletions.
diff --git a/templates/basic/assessment.pstpl b/templates/basic/assessment.pstpl
@@ -6,7 +6,7 @@
   </td>
  </tr>
  <tr>
-  <td class="assessments">
+  <td class="assessments-container">
    {ASSESSMENTS}
   </td>
  </tr>

diff --git a/templates/basic/template.css b/templates/basic/template.css
@@ -172,7 +172,7 @@ table.question tr.array1:hover,table.question tr.array2:hover {
 	border-bottom: 1px solid #000000;
 }
 
-.assessments {
+.assessments-container {
 }
 
 .clearall-result {

diff --git a/templates/bluengrey/assessment.pstpl b/templates/bluengrey/assessment.pstpl
@@ -6,7 +6,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="assessments">
+		<td class="assessments-container">
 			{ASSESSMENTS}
 		</td>
 	</tr>

diff --git a/templates/bluengrey/template.css b/templates/bluengrey/template.css
@@ -395,7 +395,7 @@ td.answertext {
 	border-bottom: 1px solid #2f5376;
 }
 
-.assessments {
+.assessments-container {
 	background-color: #FFFFFF;
 }
 

diff --git a/templates/business_grey/assessment.pstpl b/templates/business_grey/assessment.pstpl
@@ -1,11 +1,11 @@
 <br />
 <table class="assessment-table">
- <tr>
-  <td class="assessment-heading">{ASSESSMENT_HEADING}</td>
- </tr>
- <tr>
-  <td class="assessments">
-   {ASSESSMENTS}
-  </td>
- </tr>
+    <tr>
+        <td class="assessment-heading">{ASSESSMENT_HEADING}</td>
+    </tr>
+    <tr>
+        <td class="assessments-container">
+            {ASSESSMENTS}
+        </td>
+    </tr>
 </table>
diff --git a/templates/business_grey/template.css b/templates/business_grey/template.css
@@ -313,7 +313,7 @@ table.question tr.array1:hover,table.question tr.array2:hover {
 	border-bottom: 1px solid #111111;
 }
 
-.assessments {
+.assessments-container {
 }
 
 .completed-table {

diff --git a/templates/clear_logo/assessment.pstpl b/templates/clear_logo/assessment.pstpl
@@ -6,7 +6,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="assessments">
+		<td class="assessments-container">
 			{ASSESSMENTS}
 		</td>
 	</tr>

diff --git a/templates/clear_logo/template.css b/templates/clear_logo/template.css
@@ -204,7 +204,7 @@ table.question tr.array1:hover,table.question tr.array2:hover {
 
 .privacy-message {
 	width: 75%;
-	margin: 0 auto;
+	margin: 0 auto 5px auto;
 	background-color: #EFE5CA;
 }
 
@@ -266,7 +266,7 @@ table.question tr.array1:hover,table.question tr.array2:hover {
 	font-weight: bold;
 }
 
-.assessments {
+.assessments-container {
 }
 
 .completed-table {

diff --git a/templates/default/assessment.pstpl b/templates/default/assessment.pstpl
@@ -6,7 +6,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="assessments">
+		<td class="assessments-container">
 			{ASSESSMENTS}
 		</td>
 	</tr>

diff --git a/templates/default/template.css b/templates/default/template.css
@@ -344,7 +344,7 @@ table.group {
 	border-bottom: 1px solid #EEEEEE;
 }
 
-.assessments {
+.assessments-container {
 }
 
 .completed-table {

diff --git a/templates/eirenicon/assessment.pstpl b/templates/eirenicon/assessment.pstpl
@@ -6,7 +6,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="assessments">
+		<td class="assessments-container">
 			{ASSESSMENTS}
 		</td>
 	</tr>

diff --git a/templates/eirenicon/template.css b/templates/eirenicon/template.css
@@ -313,7 +313,7 @@ table.group {
 	border-bottom: 1px solid #111111;
 }
 
-.assessments {
+.assessments-container {
 }	
 
 .completed-table {

diff --git a/templates/vallendar/assessment.pstpl b/templates/vallendar/assessment.pstpl
@@ -1,13 +1,13 @@
 <br />
-<table align="center" width="75%" border="1" style="border-collapse: collapse" >
- <tr>
-  <td bgcolor="#CCCCCC" 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}</strong>
+        </td>
+    </tr>
+    <tr>
+        <td class="assessments-container">
+            {ASSESSMENTS}
+        </td>
+    </tr>
 </table>
diff --git a/templates/vallendar/clearall.pstpl b/templates/vallendar/clearall.pstpl
@@ -1,12 +1,11 @@
 <br />
- <table align="center" cellpadding="30">
-  <tr>
-   <td align="center" bgcolor="FFFFFF">
-    <font face="arial" size="2">
-    <strong><font color="red">{ANSWERSCLEARED}</font></strong><br /><br />
-	{RESTART}<br />
-	{CLOSEWINDOW}</font>
-   </td>
-  </tr>
- </table>
+<table class="clearall-result">
+    <tr>
+        <td>
+            <span class="warning-text">{ANSWERSCLEARED}</span><br /><br />
+            {RESTART}<br />
+            {CLOSEWINDOW}
+        </td>
+    </tr>
+</table>
 <br />
diff --git a/templates/vallendar/completed.pstpl b/templates/vallendar/completed.pstpl
@@ -1,10 +1,9 @@
 <br />
-<table width="75%" align="center" border="1" style="border-collapse: collapse" bgcolor="white">
+<table class="completed-table">
 	<tr>
-		<td align="center">
-			<font size="2">{COMPLETED}<br /><br />
-
-			{URL}<br /><br /></font>
+		<td class="completed-text">
+			{COMPLETED}<br /><br />
+			{URL}<br /><br />
 		</td>
 	</tr>
 </table>
diff --git a/templates/vallendar/groupdescription.pstpl b/templates/vallendar/groupdescription.pstpl
@@ -1 +1 @@
-			<br /><font face="verdana" size="2">{GROUPDESCRIPTION}</font><br /><br />
+			<span class="group-description"><br />{GROUPDESCRIPTION}</span><br /><br />
diff --git a/templates/vallendar/load.pstpl b/templates/vallendar/load.pstpl
@@ -1,7 +1,8 @@
-<center>
-<font color="red">{LOADERROR}</font><br />
-<strong><font size="+1">{LOADHEADING}</font></strong><br /><br />
-{LOADMESSAGE}<br />
-{LOADFORM}<br />
-{RETURNTOSURVEY}
-</center>
+
+<div class="survey-load">
+	<span class="warning-text">{LOADERROR}</span><br />
+	<span  class="load-heading">{LOADHEADING}</span><br /><br />
+	<span class="load-message">{LOADMESSAGE}</span><br />
+	<div class="load-form">{LOADFORM}</div><br />
+	<div  class="return-to-survey">{RETURNTOSURVEY}</div>
+</div>
diff --git a/templates/vallendar/navigator.pstpl b/templates/vallendar/navigator.pstpl
@@ -1,7 +1,7 @@
-<table width="100%" align="center" bgcolor="#17479E">
+<table class="navigator-table">
 	<tr>
-		<td align="left" width="33.3%">{SAVE}</td>
-		<td align="left" width="33.3%">{PERCENTCOMPLETE}</td>
-		<td align="right" height="12" width="33.3%">{NAVIGATOR}</td>
+		<td class="save-all" align="left" width="33.3%">{SAVE}</td>
+		<td class="progress-cell">{PERCENTCOMPLETE}</td>
+		<td class="submit-buttons" align="right" height="12" width="33.3%">{NAVIGATOR}</td>
 	</tr>
 </table>
diff --git a/templates/vallendar/privacy.pstpl b/templates/vallendar/privacy.pstpl
@@ -1,4 +1,4 @@
-<table align="center" bgcolor="#EEEEEE" width="75%">
+<table class='privacy'>
 	<tr>
 		<td align="center">
 		{PRIVACYMESSAGE}

diff --git a/templates/vallendar/question.pstpl b/templates/vallendar/question.pstpl
@@ -1,21 +1,20 @@
 <div {QUESTION_ESSENTIALS} class="{QUESTION_CLASS}{QUESTION_MAN_CLASS}{QUESTION_INPUT_ERROR_CLASS}">
-	<table width="75%" align="center" border="1" style="border-collapse: collapse; border-color:#111111" bgcolor="white">
+	<table class="question-wrapper">
 		<tr>
-			<td align="center">
+			<td>
 				<table width="100%" cellspacing="0">
 					<tr>
-						<td align="left" bgcolor="#cccccc">
-							<font size="2" color="#17479E"><b>{QUESTION_CODE}
-								<span class="asterisk">{QUESTION_MANDATORY}</span>{QUESTION_TEXT}<br />
-								<span class="questionhelp">{QUESTION_HELP}</span>
-								{QUESTION_MAN_MESSAGE}
-								{QUESTION_VALID_MESSAGE}
-							</b></font>
+						<td class="question-text">
+							{QUESTION_CODE}
+                            <span class="asterisk">{QUESTION_MANDATORY}</span>{QUESTION_TEXT}<br />
+                            <span class="questionhelp">{QUESTION_HELP}</span>
+                            {QUESTION_MAN_MESSAGE}
+                            {QUESTION_VALID_MESSAGE}
 						</td>
 					</tr>
 					<tr>
 						<td class="survey-question-help">
-							{QUESTIONHELP}</i>
+							{QUESTIONHELP}
 						</td>
 					</tr>
 					<tr>
@@ -27,10 +26,4 @@
 			</td>
 		</tr>
 	</table>
-	<table>
-		<tr>
-			<td height="1"></td>
-		</tr>
-	</table>
 </div>
-
diff --git a/templates/vallendar/register.pstpl b/templates/vallendar/register.pstpl
@@ -1,7 +1,11 @@
-<br />
-<center>
-<font color="red"><strong>{REGISTERERROR}</strong></font>
-<p><strong>{REGISTERMESSAGE1}</strong></p>
-<p>{REGISTERMESSAGE2}</p>
-{REGISTERFORM}<br />
-</center>
+
+<table class="register-table">
+	<tr>
+		<td>
+			<p class="warning-text">{REGISTERERROR}</p>
+			<p class="register-message-1">{REGISTERMESSAGE1}</p>
+			<p class="register-message-2">{REGISTERMESSAGE2}</p>
+			<div class="register-form">{REGISTERFORM}</div>
+		</td>
+	</tr>
+</table>
diff --git a/templates/vallendar/save.pstpl b/templates/vallendar/save.pstpl
@@ -1,7 +1,8 @@
-<center>
-<font color="red">{SAVEERROR}</font>
-<strong><font size="+1">{SAVEHEADING}</font></strong><br /><br />
-{SAVEMESSAGE}<br /><br />
-{SAVEFORM}<br />
-{RETURNTOSURVEY}
-</center>
+
+<div class="save-survey">
+	<span class="warning-text">{SAVEERROR}</span>
+	<span class="save-heading">{SAVEHEADING}</span><br />
+	<p class="save-message">{SAVEMESSAGE}</p>
+	<div class="save-form">{SAVEFORM}</div>
+	<p class="return-to-survey">{RETURNTOSURVEY}</p>
+</div>
diff --git a/templates/vallendar/startgroup.pstpl b/templates/vallendar/startgroup.pstpl
@@ -1,12 +1,16 @@
-<table><tr><td height="2"></td></tr></table>
-<table width="100%" align="center" bgcolor="#17479E">
+<table>
+    <tr>
+        <td height="2"></td>
+    </tr>
+</table>
+<table class="group-name">
 	<tr>
-		<td align="left">
-			<font face="verdana" size="2" color="white"><b>{GROUPNAME}</b></font>
+		<td>
+			{GROUPNAME}
 		</td>
 	</tr>
 </table>
-<table width="98%" align="center" border="0">
+<table class="group">
 	<tr>
 		<td align="left">
 
diff --git a/templates/vallendar/startpage.pstpl b/templates/vallendar/startpage.pstpl
@@ -24,7 +24,7 @@
 	<script type="text/javascript" src="{TEMPLATEURL}template.js"></script>
 	<link rel="shortcut icon" href="{TEMPLATEURL}favicon.ico" />    
 </head>
-	<body bgcolor="#C0C0C0">
-<table width="75%" align="center" style="border-collapse: collapse;border-color:#333333" bgcolor="#EDEDED" border="1" cellspacing="0">
+	<body>
+<table class="outerframe">
 	<tr>
 		<td>
diff --git a/templates/vallendar/survey.pstpl b/templates/vallendar/survey.pstpl
@@ -1,13 +1,13 @@
-<table width="100%" align="center" cellspacing="0">
+<table class="survey-header-table">
 	<tr>
-		<td align="left" bgcolor="#FFFFFF">
+		<td class="survey-name">
 			<img src="{TEMPLATEURL}logo.jpg" align="right" alt="Your logo" />
-			<font color="#17479E"><b>{SURVEYNAME}</b></font><br />
+			{SURVEYNAME}
 		</td>
 	</tr>
 	<tr>
-		<td  align="center">
-{LANGUAGECHANGER}
+		<td class="language-changer">
+			{LANGUAGECHANGER}
 		</td>
 	</tr>
 </table>