mirror of
https://github.com/ACSPRI/queXS
synced 2024-04-02 12:12:16 +00:00
Removed progress graph and replaced with text (no good for speaking over the phone if it is a graph)
Updated template to look a bit cleaner
This commit is contained in:
@@ -1049,61 +1049,10 @@ function makegraph($currentstep, $total)
|
||||
global $thissurvey;
|
||||
global $publicurl, $clang;
|
||||
|
||||
$size = intval(($currentstep-1)/$total*100);
|
||||
$size = round(($currentstep-1)/$total*100,1);
|
||||
|
||||
$graph = '<script type="text/javascript">
|
||||
$(function() {
|
||||
$("#progressbar").progressbar({
|
||||
value: '.$size.'
|
||||
});
|
||||
});';
|
||||
if (getLanguageRTL($clang->langcode))
|
||||
{
|
||||
$graph.='
|
||||
$(document).ready(function() {
|
||||
$("div.ui-progressbar-value").removeClass("ui-corner-left");
|
||||
$("div.ui-progressbar-value").addClass("ui-corner-right");
|
||||
});';
|
||||
}
|
||||
$graph.='
|
||||
</script>
|
||||
|
||||
<div id="progress-wrapper">
|
||||
<span class="hide">'.sprintf($clang->gT('You have completed %s%% of this survey'),$size).'</span>
|
||||
<div id="progress-pre">';
|
||||
if (getLanguageRTL($clang->langcode))
|
||||
{
|
||||
$graph.='100%';
|
||||
}
|
||||
else
|
||||
{
|
||||
$graph.='0%';
|
||||
}
|
||||
|
||||
$graph.='</div>
|
||||
<div id="progressbar"></div>
|
||||
<div id="progress-post">';
|
||||
if (getLanguageRTL($clang->langcode))
|
||||
{
|
||||
$graph.='0%';
|
||||
}
|
||||
else
|
||||
{
|
||||
$graph.='100%';
|
||||
}
|
||||
$graph.='</div>
|
||||
</div>';
|
||||
|
||||
if ($size == 0) // Progress bar looks dumb if 0
|
||||
|
||||
{
|
||||
$graph.='
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$("div.ui-progressbar-value").hide();
|
||||
});
|
||||
</script>';
|
||||
}
|
||||
$graph='
|
||||
<div>'.sprintf($clang->gT('%s%% complete'),$size).'</div>';
|
||||
|
||||
return $graph;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
body {
|
||||
font-family: arial, verdana, sans-serif;
|
||||
font-family: serif;
|
||||
font-size: 14px;
|
||||
line-height: 17px;
|
||||
background-color: #999;
|
||||
@@ -13,8 +13,12 @@ table.question {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
td.graph {
|
||||
text-align:center;
|
||||
}
|
||||
|
||||
td {
|
||||
font-family: arial, verdana, sans-serif;
|
||||
font-family: serif;
|
||||
font-size: 14px;
|
||||
line-height: 17px;
|
||||
background-color: #EEE;
|
||||
@@ -49,7 +53,7 @@ td.tenpoint {
|
||||
.asterisk {
|
||||
color: red;
|
||||
font-size: 9pt;
|
||||
font-family: verdana;
|
||||
font-family: serif;
|
||||
}
|
||||
|
||||
.questionhelp {
|
||||
@@ -58,7 +62,7 @@ td.tenpoint {
|
||||
}
|
||||
|
||||
.questiontext {
|
||||
font-family: verdana;
|
||||
font-family: serif;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
}
|
||||
@@ -150,6 +154,7 @@ table,img {
|
||||
background-color: #eee;
|
||||
text-align:center;
|
||||
font-size: 16pt;
|
||||
line-height: 20pt;
|
||||
}
|
||||
|
||||
.bf,.array2 {
|
||||
@@ -194,7 +199,7 @@ table.question tr.array1:hover,table.question tr.array2:hover {
|
||||
|
||||
.clearall-result {
|
||||
font-size: small;
|
||||
font-family:Arial, Helvetica, sans-serif;
|
||||
font-family:serif;
|
||||
text-align: center;
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
@@ -217,7 +222,7 @@ table.question tr.array1:hover,table.question tr.array2:hover {
|
||||
|
||||
.group-description {
|
||||
font-size: small;
|
||||
font-family:Verdana, Arial, Helvetica, sans-serif;
|
||||
font-family:serif;
|
||||
}
|
||||
|
||||
.load-error {
|
||||
@@ -288,7 +293,7 @@ table.question tr.array1:hover,table.question tr.array2:hover {
|
||||
|
||||
.group-name {
|
||||
font-size: small;
|
||||
font-family:Verdana, Arial, Helvetica, sans-serif;
|
||||
font-family:serif;
|
||||
color: #666666;
|
||||
font-weight: bold;
|
||||
}
|
||||
@@ -316,7 +321,7 @@ table.question tr.array1:hover,table.question tr.array2:hover {
|
||||
}
|
||||
|
||||
.survey-list-table .site-name {
|
||||
font-family:Verdana, Arial, Helvetica, sans-serif;
|
||||
font-family:serif;
|
||||
font-weight: bold;
|
||||
font-size: large;
|
||||
color: #328639;
|
||||
|
||||
Reference in New Issue
Block a user