Skip to content

Commit

Permalink
dev Templates changes
Browse files Browse the repository at this point in the history 
dev Removed inline help

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@7685 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@c-schmitz
c-schmitz committed Sep 28, 2009
1 parent 66fe224 commit 29592d6
Show file tree
Hide file tree
Showing 121 changed files with 100 additions and 16,266 deletions.
97 changes: 5 additions & 92 deletions admin/admin.php
View file
Expand Up @@ -52,10 +52,7 @@

if ($action != 'showprintablesurvey' && $action != 'ajaxquestionattributes')
{
$adminoutput = helpscreenscript();
$adminoutput .= "<table width='100%' border='0' cellpadding='0' cellspacing='0' >\n"
."\t<tr>\n"
."<td valign='top' align='center' bgcolor='#F8F8FF'>\n";
$adminoutput="<div id='wrapper'>";
} else {$adminoutput='';}

if($casEnabled==true)
Expand Down Expand Up @@ -567,9 +564,7 @@

$adminoutput = getAdminHeader($_SESSION['metaHeader']).$adminoutput; // All future output is written into this and then outputted at the end of file
unset($_SESSION['metaHeader']);
$adminoutput.= "</td>\n".helpscreen()
. "\t</tr>\n"
. "</table>\n";
$adminoutput.= "</div>\n";
if(!isset($_SESSION['checksessionpost']))
$_SESSION['checksessionpost'] = '';
$adminoutput .= "<script type=\"text/javascript\">\n"
Expand Down Expand Up @@ -610,7 +605,7 @@
. "//-->\n"
. "</script>\n";

$adminoutput .= "".getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey Online Manual"));
$adminoutput .= getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey Online Manual"));
}

}
Expand All @@ -620,9 +615,7 @@
if (!isset($_SESSION['metaHeader'])) {$_SESSION['metaHeader']='';}
$adminoutput = getAdminHeader($_SESSION['metaHeader']).$adminoutput; // All future output is written into this and then outputted at the end of file
unset($_SESSION['metaHeader']);
$adminoutput.= "</td>\n".helpscreen()
. "\t</tr>\n"
. "</table>\n"
$adminoutput.= "</div>\n"
. getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey Online Manual"));

}
Expand All @@ -636,87 +629,7 @@
echo $adminoutput;
}


function helpscreenscript()
// returns the script part for online help to be included outside a table
{
$helpoutput= "<script type='text/javascript'>\n"
."\tfunction showhelp(action)\n"
."{\n"
."var name='help';\n"
."if (action == \"hide\")\n"
."\t{\n"
."\tdocument.getElementById(name).style.display='none';\n"
."\t}\n"
."else if (action == \"show\")\n"
."\t{\n"
."\tdocument.getElementById(name).style.display='';\n"
."\t}\n"
."}\n"
."</script>\n";
return $helpoutput;
}


function helpscreen()
// This functions loads the nescessary helpscreens for each action and hides the help window
//
{
global $homeurl, $langdir, $imagefiles;
global $surveyid, $gid, $qid, $action, $clang;

$helpoutput="<td id='help' width='200' valign='top' style='display: none' bgcolor='#F8F8FF'>\n"
."\t<table width='100%'><tr><td>"
."<table width='100%' align='center' cellspacing='0'>\n"
."<tr>\n"
."\t<td bgcolor='#D2E0F2' height='8'>\n"
."<font size='1'><strong>"
.$clang->gT("Help")."</strong>\n"
."\t</font></td>\n"
."</tr>\n"
."<tr>\n"
."\t<td align='center' bgcolor='#EEF6FF' style='border-style: solid; border-width: 1px; border-color: #D2E0F2'>\n"
."<img src='$imagefiles/blank.gif' alt='' width='20' hspace='0' border='0' align='left' />\n"
."<input type='image' src='$imagefiles/close.gif' name='CloseHelp' align='right' onclick=\"showhelp('hide')\" />\n"
."\t</td>\n"
."</tr>\n"
."<tr>\n"
."\t<td bgcolor='#EEF6FF' height='100%' style='border-width: 0px;'>\n";
//determine which help document to show
if (!$surveyid && $action != "editusers")
{
$helpdoc = "$langdir/admin.html";
}
elseif (!$surveyid && $action=="editusers")
{
$helpdoc = "$langdir/users.html";
}
elseif ($surveyid && !$gid)
{
$helpdoc = "$langdir/survey.html";
}
elseif ($surveyid && $gid && !$qid)
{
$helpdoc = "$langdir/group.html";
}
elseif ($surveyid && $gid && $qid && !returnglobal('viewanswer'))
{
$helpdoc = "$langdir/question.html";
}
elseif ($surveyid && $gid && $qid && (returnglobal('viewanswer')))
{
$helpdoc = "$langdir/answer.html";
}
$helpoutput.= "<iframe width='200' height='400' src='$helpdoc' marginwidth='2' marginheight='2'>\n"
."</iframe>\n"
."\t</td>"
."</tr>\n"
."\t</table></td></tr></table>\n"
."</td>\n";
return $helpoutput;
}




function convertToArray($stringtoconvert, $seperator, $start, $end)
// this function is still used to read SQL files from version 1.0 or older
Expand Down
2 changes: 1 addition & 1 deletion admin/globalsettings.php
View file
Expand Up @@ -181,7 +181,7 @@ function globalsettingsdisplay()
. "</select></li>\n";

$editsurvey.= "\t<li><label for='timeadjust'>".$clang->gT("Time difference (in hours):")."</label>\n"
. "\t\t<input type='text' size='10' id='timeadjust' name='timeadjust' value=\"".htmlspecialchars(str_replace(array('+',' hours'),array('',''),getGlobalSettting('timeadjust')))."\" /></li>\n";
. "\t\t<input type='text' size='10' id='timeadjust' name='timeadjust' value=\"".htmlspecialchars(str_replace(array('+',' hours'),array('',''),getGlobalSetting('timeadjust')))."\" /></li>\n";

$thisusepdfexport=getGlobalSetting('usepdfexport');
$editsurvey .= "\t<li><label for='usepdfexport'>".$clang->gT("PDF export available:")."</label>\n"
Expand Down
6 changes: 3 additions & 3 deletions admin/scripts/templates.js
View file
Expand Up @@ -17,15 +17,15 @@ $(document).ready(function(){
$('#previewiframe').css("width", "320px");
$('#previewiframe').css("height", "396px");
});
$('#640').click(function(){
$('#x640').click(function(){
$('#previewiframe').css("width", "640px");
$('#previewiframe').css("height", "480px");
});
$('#800').click(function(){
$('#x800').click(function(){
$('#previewiframe').css("width", "800px");
$('#previewiframe').css("height", "600px");
});
$('#1024').click(function(){
$('#x1024').click(function(){
$('#previewiframe').css("width", "1024px");
$('#previewiframe').css("height", "768px");
});
Expand Down
131 changes: 77 additions & 54 deletions admin/styles/default/adminstyle.css
View file
@@ -1,44 +1,45 @@
body {
font-family: verdana, arial, sans-serif;
text-align: left;
background-color: #5670A1;
margin: 0;
font-family: verdana, arial, sans-serif;
text-align: left;
background-color: #5670A1;
margin: 0;
font-size: 9pt;
}

div, form {
margin: 0;
padding: 0;
margin: 0;
padding: 0;
}

ul,ol {
text-align: left;
font-size: 10pt;
color: #000;
text-align: left;
font-size: 10pt;
color: #000;
}

p {
clear: left;
}

.boxstyle {
border-color: #9C0;
border-style: solid;
border-width: 1px;
border-color: #9C0;
border-style: solid;
border-width: 1px;
}

.footer {
text-align: center;
color: #9C0;
height: 30px;
background: #121a28;
margin: 0;
padding: 5px;
text-align: center;
color: #9C0;
height: 30px;
background: #121a28;
margin: 0;
padding: 5px;
margin-bottom:400px;
clear:left;
}

img {
border: 0;
border: 0;
}

a {
Expand All @@ -48,29 +49,29 @@ a {
}

a:hover {
color: #819D26;
text-decoration: underline;
color: #819D26;
text-decoration: underline;
}

th, p, div {
font-size: 10pt;
font-size: 10pt;
}

.maintitle {
font-size: 14pt;
font-weight: 700;
color: #328639;
text-align: center;
background: #C4C4C4;
border-top: 2px solid #C9EF50;
border-bottom: 2px solid #6a8b03;
background-image: url(bkgmaintitle.gif);
background-repeat: repeat-x;
margin: auto;
font-size: 14pt;
font-weight: 700;
color: #328639;
text-align: center;
background: #C4C4C4;
border-top: 2px solid #C9EF50;
border-bottom: 2px solid #6a8b03;
background-image: url(bkgmaintitle.gif);
background-repeat: repeat-x;
width:100%;
}

table.statisticstable {
margin: 2px auto;
margin: 2px auto;
}


Expand All @@ -79,27 +80,32 @@ table.statisticstable span {
}

.basic {
color: #1d2d45;
color: #1d2d45;
}

.statisticstable td {
vertical-align: top;
vertical-align: top;
}

div.menubar {
background-color: #EEF6FF;
width: 99.1%;
margin-top: 3px;
background-color: #EEF6FF;
clear:left;
padding:0;
margin:3px auto 0 auto;
width: 99.5%;
height: 60px;
}

.menubar-main {
background-color: #EEF6FF;
width: 100%;
float: left;
border-color: #D2E0F2 #8195BA #8195BA #D2E0F2;
border-style: solid;
border-width: 1px;
background-color: #EEF6FF;
width: 99.6%;
float: left;
border-color: #D2E0F2 #8195BA #D2E0F2 #D2E0F2;
border-style: solid;
border-width: 1px;
padding:0 0.2%;
height: 43px;

}

.menubar img {
Expand All @@ -112,12 +118,15 @@ div.menubar {
.menubar-title {
background-color: #EEF6FF;
float: left;
width: 100%;
width: 99.6%;
font-size: 11px;
text-align: left;
border-color: #D2E0F2 #8195BA #D2E0F2 #D2E0F2;
border-style: solid;
border-width: 1px;
padding:0 0.2%;
height:14px;

}


Expand All @@ -132,6 +141,7 @@ div.menubar {
clear: none;
margin: 0;
padding: 0;

}

.menubar-right {
Expand Down Expand Up @@ -186,7 +196,7 @@ table.attributetable {

table.table2columns {
background-color: #FFF;
width: 99.3%;
width: 100%;
text-align: center;
border: 1px solid;
border-color: #fff #8195BA #8195BA #D2E0F2;
Expand Down Expand Up @@ -846,18 +856,31 @@ div.loader {
height:31px;
}

.background
{
#wrapper {
background-color:#f8f8ff;
width:100%;
padding:1px 0px;
}

.background {
background-color:#f8f8ff;
padding:1% 10%;
}



#editsurvey textarea,
#editsurvey input{
width: 600px;
#editsurvey input {
width: 600px;
}

#editsurvey td{
padding-left: 15px;
font-size: 9pt;
}
#editsurvey td {
padding-left: 15px;
font-size: 9pt;
}


#help
{
float:right;
}

0 comments on commit 29592d6

Please sign in to comment.