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@9304 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 22, 2010 · b67bb80 · b67bb80
1 parent da695f8
commit b67bb80
Show file tree

Hide file tree

Showing 11 changed files with 166 additions and 59 deletions.
diff --git a/templates/eirenicon/load.pstpl b/templates/eirenicon/load.pstpl
@@ -1,7 +1,7 @@
 <div class="load-survey">
 	<span class="warning-text">{LOADERROR}</span><br />
-	<span  class="load-heading">{LOADHEADING}</span><br /><br />
-	<span  class="load-message">{LOADMESSAGE}</span><br />
+	<span class="load-heading">{LOADHEADING}</span><br /><br />
+	<span class="load-message">{LOADMESSAGE}</span><br />
 	<div class="load-form">{LOADFORM}</div><br />
 	<span  class="return-to-survey">{RETURNTOSURVEY}</span>
 </div>
diff --git a/templates/limespired/assessment.pstpl b/templates/limespired/assessment.pstpl
@@ -1,5 +1,5 @@
 <br />
-<div class="survey-assessment"><strong>{ASSESSMENT_HEADING}</strong></div>
-<div>
+<div class="survey-assessment">{ASSESSMENT_HEADING}</div>
+<div class="assessments">
 	{ASSESSMENTS}
 </div>
diff --git a/templates/limespired/clearall.pstpl b/templates/limespired/clearall.pstpl
@@ -1,6 +1,6 @@
 <br />
 <div class="survey-cleared">
-    <span style="color:red; font-weight:bold;">{ANSWERSCLEARED}</span>
+    <span class="warning-text">{ANSWERSCLEARED}</span>
 	<br /><br />
 	{RESTART}<br />
 </div>

diff --git a/templates/limespired/endpage.pstpl b/templates/limespired/endpage.pstpl
@@ -1,13 +1,14 @@
-	</div>
-<div id="prefooter1"></div>
-<!-- <div id="prefooter2"></div> -->
-<div id="prefooter3"><a  href="http://www.limesurvey.org/" title="Go to the LimeSurvey Website" class="imglink"><img src="{TEMPLATEURL}poweredby.png" class="kullogo" /></a>
-<br /><span class="credits">LimeSurvey is Free software<br /><a href="http://www.donate.limesurvey.org">Donate</a></span>
-</div>
-<div id="footer">
-	<div class="rk-1">
-		<div class="rk-2"></div>
-	</div>
-</div>
-	</div>
-	</div>
+	</div>
+	<div id="prefooter1"></div>
+	<!-- <div id="prefooter2"></div> -->
+	<div id="prefooter3">
+		<a  href="http://www.limesurvey.org/" title="Go to the LimeSurvey Website" class="imglink"><img src="{TEMPLATEURL}poweredby.png" class="kullogo" /></a>
+		<br /><span class="credits">LimeSurvey is Free software<br /><a href="http://www.donate.limesurvey.org">Donate</a></span>
+	</div>
+	<div id="footer">
+		<div class="rk-1">
+			<div class="rk-2"></div>
+		</div>
+	</div>
+</div>
+</div>
diff --git a/templates/limespired/load.pstpl b/templates/limespired/load.pstpl
@@ -1,9 +1,7 @@
-<center>
 <div class="survey-load">
-<span style="color:red">{LOADERROR}</span><br />
-<span style="font-size:18px; font-weight:bold;">{LOADHEADING}</span><br /><br />
-{LOADMESSAGE}<br />
-{LOADFORM}<br />
-{RETURNTOSURVEY}
+	<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 />
+	<span  class="return-to-survey">{RETURNTOSURVEY}</span>
 </div>
-</center>
diff --git a/templates/limespired/navigator.pstpl b/templates/limespired/navigator.pstpl
@@ -1,5 +1,3 @@
-<center><br />
-<div class="survey-navigator">{NAVIGATOR}</div>
-<div> {CLEARALL} </div>
-{SAVE}
-</center>
+<div class="survey-navigator">{NAVIGATOR}</div>
+<div class="clear-all">{CLEARALL}</div>
+<div class="save-all">{SAVE}</div>
diff --git a/templates/limespired/question.pstpl b/templates/limespired/question.pstpl
@@ -1,13 +1,13 @@
-<div {QUESTION_ESSENTIALS} class="{QUESTION_CLASS}{QUESTION_MAN_CLASS}{QUESTION_INPUT_ERROR_CLASS}">
-	<div class="survey-question">
-		<div class="survey-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}
-		</div>
-		<div class="survey-question-answer">{ANSWER}</div>
-		<div class="survey-question-help">{QUESTIONHELP}</div>
-	</div>
-	<div class="survey-question-space"></div>
-</div>
+<div {QUESTION_ESSENTIALS} class="{QUESTION_CLASS}{QUESTION_MAN_CLASS}{QUESTION_INPUT_ERROR_CLASS}">
+	<div class="survey-question">
+		<div class="survey-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}
+		</div>
+		<div class="survey-question-answer">{ANSWER}</div>
+		<div class="survey-question-help">{QUESTIONHELP}</div>
+	</div>
+	<div class="survey-question-space"></div>
+</div>
diff --git a/templates/limespired/register.pstpl b/templates/limespired/register.pstpl
@@ -1,7 +1,7 @@
-<br />
-<center>
-<span style="color:red;font-weight: bold;">{REGISTERERROR}</span>
-<span style="font-weight:bold">{REGISTERMESSAGE1}</span><br /><br />
-{REGISTERMESSAGE2}<br /><br />
-{REGISTERFORM}<br />
-</center>
+
+<div class="register">
+	<span class="warning-text">{REGISTERERROR}</span>
+	<p class="register-message-1">{REGISTERMESSAGE1}</p>
+	<p class="register-message-2">{REGISTERMESSAGE2}</p>
+	<div class="register-form">{REGISTERFORM}</div>
+</div>
diff --git a/templates/limespired/save.pstpl b/templates/limespired/save.pstpl
@@ -1,7 +1,7 @@
-<center>
-<span style="color:red; font-weight:bold;">{SAVEERROR}</span>
-<span style="font-size:16px;">{SAVEHEADING}</span><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/limespired/surveylist.pstpl b/templates/limespired/surveylist.pstpl
@@ -1 +1,14 @@
-<div class="nosurveyid">{NOSURVEYID}</div>
+<div class="survey-list-wrapper">
+	<div class="survey-list-heading">
+		 {SURVEYLISTHEADING}
+	</div>
+	<div class="survey-list">
+		<ul>{SURVEYLIST}</ul>
+	</div>
+	<div class="survey-contact">
+		{SURVEYCONTACT}
+	</div>
+	<div class="language-changer">
+	   <p>{LANGUAGECHANGER}</p>
+	</div>
+</div>
diff --git a/templates/limespired/template.css b/templates/limespired/template.css
@@ -7,8 +7,101 @@
   text-align: center;
 }
 
+.survey-navigator,
+.clear-all,
+.save-all {
+  text-align: center;
+}
+
 .survey-navigator {
-  margin: 0 0 10px 0;
+  margin: 15px 0 10px 0;
+}
+
+.warning-text {
+	color:#FF0000;
+	font-weight: bold;
+}
+
+.register {
+	text-align: center;
+}
+
+.register-message-1 {
+	font-weight: bold;
+}
+
+.register-message-2 {
+}
+
+.register-form {
+	margin-bottom: 10px;
+}
+
+.register-form table.register {
+	margin: 0 auto 0 auto;
+}
+
+.survey-load {
+	text-align: center;
+}
+
+.load-survey,
+.save-survey {
+	text-align: center;
+	padding: 10px 0;
+}
+
+.load-heading,
+.save-heading {
+	font-size: 18px;
+	font-weight: bold;
+}
+
+.load-message {
+}
+
+.load-form table,
+.save-form table {
+	margin: 0 auto 0 auto;
+}
+
+.return-to-survey {
+}
+
+.save-message{
+}
+
+.save-form{
+}
+
+.survey-list-wrapper {
+	background-color:#E0FBFF;
+	border:1px solid #3C9AAE;
+	margin:20px 0;
+	padding:20px 10px;
+	text-align:center;
+}
+
+.survey-list-heading {
+	font-weight: bold;
+}
+
+.survey-list {
+}
+
+.survey-list ul {
+	padding: 0;
+}
+
+.survey-list li {
+	list-style: none;
+	padding-bottom: 5px;
+}
+
+.survey-contact {
+}
+
+.language-changer {
 }
 
 /* --------------------------------------------------- */
@@ -391,6 +484,10 @@ table.question tr.array2:hover {
   background: #f0fdff;
 }
 
+.survey-assessment {
+  font-weight: bold;
+}
+
 A:link,A:visited,A:active {
   text-decoration: none;
   color: #00677d;