Skip to content

Commit

Permalink
Dev: some cleaning, removed unused files, etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
louis committed Oct 2, 2015
1 parent a9ab432 commit 4be43c0
Show file tree
Hide file tree
Showing 13 changed files with 207 additions and 207 deletions.
54 changes: 27 additions & 27 deletions application/views/admin/dataentry/active_html_view.php
Expand Up @@ -5,23 +5,23 @@
{ ?>

<script type='text/javascript'>
<!--
function saveshow(value)
{
if (document.getElementById(value).checked == true)
{
document.getElementById("closerecord").checked=false;
document.getElementById("closerecord").disabled=true;
document.getElementById("saveoptions").style.display="";
}
else
{
document.getElementById("saveoptions").style.display="none";
document.getElementById("closerecord").disabled=false;
}
}
//-->
</script>
<!--
function saveshow(value)
{
if (document.getElementById(value).checked == true)
{
document.getElementById("closerecord").checked=false;
document.getElementById("closerecord").disabled=true;
document.getElementById("saveoptions").style.display="";
}
else
{
document.getElementById("saveoptions").style.display="none";
document.getElementById("closerecord").disabled=false;
}
}
//-->
</script>
<tr>
<td colspan='3' align='center'>
<table><tr><td align='left'>
Expand All @@ -40,16 +40,16 @@ function saveshow(value)
</td></tr></table>
<div name='saveoptions' id='saveoptions' style='display: none'>
<table align='center' class='outlinetable'>
<tr><td align='right'><?php eT("Identifier:"); ?></td>
<td><input type='text' name='save_identifier' /></td></tr>
<tr><td align='right'><?php eT("Password:"); ?></td>
<td><input type='password' name='save_password' /></td></tr>
<tr><td align='right'><?php eT("Confirm Password:"); ?></td>
<td><input type='password' name='save_confirmpassword' /></td></tr>
<tr><td align='right'><?php eT("Email:"); ?></td>
<td><input type='email' name='save_email' /></td></tr>
<tr><td align='right'><?php eT("Start language:"); ?></td>
<td>
<tr><td align='right'><?php eT("Identifier:"); ?></td>
<td><input type='text' name='save_identifier' /></td></tr>
<tr><td align='right'><?php eT("Password:"); ?></td>
<td><input type='password' name='save_password' /></td></tr>
<tr><td align='right'><?php eT("Confirm Password:"); ?></td>
<td><input type='password' name='save_confirmpassword' /></td></tr>
<tr><td align='right'><?php eT("Email:"); ?></td>
<td><input type='email' name='save_email' /></td></tr>
<tr><td align='right'><?php eT("Start language:"); ?></td>
<td>
<select name='save_language' class="form-control">
<?php foreach ($slangs as $lang)
{
Expand Down
10 changes: 5 additions & 5 deletions application/views/admin/dataentry/import.php
Expand Up @@ -19,18 +19,18 @@
'name' => 'ok'
),
gT('Cancel') => array(
'type' => 'link',
'href' => App()->createUrl('plugins/index')
)
'type' => 'link',
'href' => App()->createUrl('plugins/index')
)
)
));
echo CHtml::openTag('div', array('class' => 'messagebox ui-corner-all'));
echo CHtml::tag('div', array('class' => 'warningheader'), gT("Warning"));
eT("You can import all old responses that are compatible with your current survey. Compatibility is determined by comparing column types and names, the ID field is always ignored.");
echo '<br/>';
echo '<br/>';
eT("Using type coercion may break your data; use with care or not at all if possible.");
echo '<br/>';
eT("Currently we detect and handle the following changes:");
eT("Currently we detect and handle the following changes:");

$list = array(

Expand Down
62 changes: 31 additions & 31 deletions application/views/admin/dataentry/vvimport_result.php
@@ -1,33 +1,33 @@
<div class='messagebox'>
<div class='header <?php echo $class;?>'>
<?php echo $title;?>
</div>
<dl>
<?php if(isset($aResult['success']) && is_array($aResult['success'])) {?>
<dt class='success'><?php eT("Success"); ?></dt>
<?php foreach($aResult['success'] as $sSucces) { ?>
<dd><?php echo $sSucces ?></dd>
<?php }?>
<?php } ?>
<?php if(isset($aResult['errors']) && is_array($aResult['errors'])) {?>
<dt class='error'><?php eT("Error"); ?></dt>
<?php foreach($aResult['errors'] as $sError) { ?>
<dd><?php echo $sError ?></dd>
<?php }?>
<?php } ?>
<?php if(isset($aResult['warnings']) && is_array($aResult['warnings'])) {?>
<dt class='warning'><?php eT("Warning"); ?></dt>
<?php foreach($aResult['warnings'] as $sWarning) { ?>
<dd><?php echo $sWarning ?></dd>
<?php }?>
<?php } ?>
</dl>
<?php //echo $message;?>
<?php if(isset($aUrls) && count($aUrls)) {?>
<?php foreach($aUrls as $url){ ?>
<a class='limebutton submit' href='<?php echo $url['link'] ?>'><?php echo $url['text'] ?></a>
<?php } ?>
<?php }else{ ?>
<a class='limebutton submit' href='<?php echo $this->createUrl("admin/responses/sa/browse/surveyid/$iSurveyId"); ?>'><?php eT("Browse responses") ?></a>
<?php } ?>
<div class='header <?php echo $class;?>'>
<?php echo $title;?>
</div>
<dl>
<?php if(isset($aResult['success']) && is_array($aResult['success'])) {?>
<dt class='success'><?php eT("Success"); ?></dt>
<?php foreach($aResult['success'] as $sSucces) { ?>
<dd><?php echo $sSucces ?></dd>
<?php }?>
<?php } ?>
<?php if(isset($aResult['errors']) && is_array($aResult['errors'])) {?>
<dt class='error'><?php eT("Error"); ?></dt>
<?php foreach($aResult['errors'] as $sError) { ?>
<dd><?php echo $sError ?></dd>
<?php }?>
<?php } ?>
<?php if(isset($aResult['warnings']) && is_array($aResult['warnings'])) {?>
<dt class='warning'><?php eT("Warning"); ?></dt>
<?php foreach($aResult['warnings'] as $sWarning) { ?>
<dd><?php echo $sWarning ?></dd>
<?php }?>
<?php } ?>
</dl>
<?php //echo $message;?>
<?php if(isset($aUrls) && count($aUrls)) {?>
<?php foreach($aUrls as $url){ ?>
<a class='limebutton submit' href='<?php echo $url['link'] ?>'><?php echo $url['text'] ?></a>
<?php } ?>
<?php }else{ ?>
<a class='limebutton submit' href='<?php echo $this->createUrl("admin/responses/sa/browse/surveyid/$iSurveyId"); ?>'><?php eT("Browse responses") ?></a>
<?php } ?>
</div>
Empty file.
Empty file.
18 changes: 9 additions & 9 deletions application/views/admin/participants/attributeMap_view.php
Expand Up @@ -25,12 +25,12 @@
</strong>
</div>
<?php
$columncount = 0;
if (!empty($selectedcentralattribute))
$columncount = $columncount + 2;
if (!empty($selectedtokenattribute))
$columncount++;
$columnstyle = "attrcol_".$columncount;
$columncount = 0;
if (!empty($selectedcentralattribute))
$columncount = $columncount + 2;
if (!empty($selectedtokenattribute))
$columncount++;
$columnstyle = "attrcol_".$columncount;
?>

<div id="centralattribute" class="<?php echo $columnstyle ?>">
Expand Down Expand Up @@ -101,11 +101,11 @@
</div>

</div>
<p>
<input type="button" name="goback" onclick="history.back();" id="back" value="<?php eT('Back')?>" />
<p>
<input type="button" name="goback" onclick="history.back();" id="back" value="<?php eT('Back')?>" />
<input type='button' name='reset' onClick='window.location.reload();' id='reset' value="<?php eT('Reset') ?>" />
<input type="button" name="attmap" id="attmap" value="<?php eT('Continue')?>" />
</p>
</p>
<?php
$ajaxloader = array(
'src' => Yii::app()->getConfig('adminimageurl') . '/ajax-loader.gif',
Expand Down
10 changes: 5 additions & 5 deletions application/views/admin/quotas/editquota_view.php
@@ -1,9 +1,9 @@
<div class="side-body col-lg-8">
<div class="row">
<div class="col-lg-12 content-right">
<h3>
<?php eT("Edit quota");?>
</h3>
<div class="row">
<div class="col-lg-12 content-right">
<h3>
<?php eT("Edit quota");?>
</h3>


<?php echo CHtml::form(array("admin/quotas/sa/modifyquota/surveyid/{$iSurveyId}"), 'post', array('id'=>'editquota','class'=>'form30')); ?>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/quotas/editquotalang_view.php
Expand Up @@ -4,4 +4,4 @@
<li><label for='quotals_url_<?php echo $lang;?>'><?php eT("URL");?>:</label><input id="quotals_url_<?php echo $lang;?>" name="quotals_url_<?php echo $lang;?>" type="text" size="30" maxlength="255" value="<?php echo htmlspecialchars($langquotainfo['quotals_url']);?>" /></li>
<li><label for='quotals_urldescrip_<?php echo $lang;?>'><?php eT("URL description");?>:</label><input id="quotals_urldescrip_<?php echo $lang;?>" name="quotals_urldescrip_<?php echo $lang;?>" type="text" size="30" maxlength="255" value="<?php echo htmlspecialchars($langquotainfo['quotals_urldescrip']);?>" /></li>
</ul>
</div>
</div>
62 changes: 31 additions & 31 deletions application/views/admin/quotas/newanswer_view.php
@@ -1,35 +1,35 @@
<div class="side-body col-lg-8">
<div class="row">
<div class="col-lg-12 content-right">
<h3>
<?php eT("Survey quota");?>: <?php eT("Add answer");?>
</h3>
<div class="row">
<div class="col-lg-12 content-right">
<h3>
<?php eT("Survey quota");?>: <?php eT("Add answer");?>
</h3>


<div class="jumbotron message-box">
<h2><?php echo sprintf(gT("New answer for quota '%s'"), $quota_name);?></h2>
<p class="lead">
<?php eT("Select question");?>:
</p>
<?php echo CHtml::form(array("admin/quotas/sa/new_answer/surveyid/{$iSurveyId}/subaction/new_answer_two"), 'post'); ?>
<p>
<select name="quota_qid" size="15">
<?php foreach ($newanswer_result as $questionlisting) { ?>
<option value="<?php echo $questionlisting['qid'];?>">
<?php echo $questionlisting['title'];?>: <?php echo strip_tags(substr($questionlisting['question'],0,40));?>
</option>
<?php } ?>
</select>
<input type="hidden" name="sid" value="'.$iSurveyId.'" />
<input type="hidden" name="action" value="quotas" />
<input type="hidden" name="subaction" value="new_answer_two" />
<input type="hidden" name="quota_id" value="<?php echo sanitize_int($_POST['quota_id']);?>" />
</p>
<p>
<input name="submit" type="submit" class="submit btn btn-default" value="<?php eT("Next");?>" />
</p>
</form>
</div>
</div>
</div>
<div class="jumbotron message-box">
<h2><?php echo sprintf(gT("New answer for quota '%s'"), $quota_name);?></h2>
<p class="lead">
<?php eT("Select question");?>:
</p>
<?php echo CHtml::form(array("admin/quotas/sa/new_answer/surveyid/{$iSurveyId}/subaction/new_answer_two"), 'post'); ?>
<p>
<select name="quota_qid" size="15">
<?php foreach ($newanswer_result as $questionlisting) { ?>
<option value="<?php echo $questionlisting['qid'];?>">
<?php echo $questionlisting['title'];?>: <?php echo strip_tags(substr($questionlisting['question'],0,40));?>
</option>
<?php } ?>
</select>
<input type="hidden" name="sid" value="'.$iSurveyId.'" />
<input type="hidden" name="action" value="quotas" />
<input type="hidden" name="subaction" value="new_answer_two" />
<input type="hidden" name="quota_id" value="<?php echo sanitize_int($_POST['quota_id']);?>" />
</p>
<p>
<input name="submit" type="submit" class="submit btn btn-default" value="<?php eT("Next");?>" />
</p>
</form>
</div>
</div>
</div>
</div>
86 changes: 43 additions & 43 deletions application/views/admin/quotas/newanswertwo_view.php
@@ -1,47 +1,47 @@
<div class="side-body col-lg-8">
<div class="row">
<div class="col-lg-12 content-right">
<h3>
<?php eT("Survey quota");?>: <?php eT("Add answer");?>
</h3>
<div class="row">
<div class="col-lg-12 content-right">
<h3>
<?php eT("Survey quota");?>: <?php eT("Add answer");?>
</h3>

<?php if (count($question_answers) == $x): ?>
<div class="jumbotron message-box">
<h2><?php eT("All answers are already selected in this quota.");?></h2>
<p>
<input class="btn btn-lg btn-success" type="submit" onclick="window.open('<?php echo $this->createUrl("admin/quotas/sa/index/surveyid/$iSurveyId");?>', '_top')" value="<?php eT("Continue");?>"/>
</p>
</div>
<?php else:?>
<div class="jumbotron message-box">
<h2><?php echo sprintf(gT("New answer for quota '%s'"), $quota_name);?></h2>
<p class="lead"><?php eT("Select Answer");?>:</p>
<?php echo CHtml::form(array("admin/quotas/sa/insertquotaanswer/surveyid/{$iSurveyId}"), 'post', array('#'=>'quota_'.sanitize_int($_POST['quota_id']))); ?>
<p>
<select name="quota_anscode" size="15">
<?php
while (list($key,$value) = each($question_answers))
{
if (!isset($value['rowexists'])) echo '<option value="'.$key.'">'.strip_tags(substr($value['Display'],0,40)).'</option>';
}
?>
</select>
</p>
<p>
<?php if (count($question_answers) == $x): ?>
<div class="jumbotron message-box">
<h2><?php eT("All answers are already selected in this quota.");?></h2>
<p>
<input class="btn btn-lg btn-success" type="submit" onclick="window.open('<?php echo $this->createUrl("admin/quotas/sa/index/surveyid/$iSurveyId");?>', '_top')" value="<?php eT("Continue");?>"/>
</p>
</div>
<?php else:?>
<div class="jumbotron message-box">
<h2><?php echo sprintf(gT("New answer for quota '%s'"), $quota_name);?></h2>
<p class="lead"><?php eT("Select Answer");?>:</p>
<?php echo CHtml::form(array("admin/quotas/sa/insertquotaanswer/surveyid/{$iSurveyId}"), 'post', array('#'=>'quota_'.sanitize_int($_POST['quota_id']))); ?>
<p>
<select name="quota_anscode" size="15">
<?php
while (list($key,$value) = each($question_answers))
{
if (!isset($value['rowexists'])) echo '<option value="'.$key.'">'.strip_tags(substr($value['Display'],0,40)).'</option>';
}
?>
</select>
</p>
<p>

<input class="btn btn-lg btn-success" name="submit" type="submit" class="submit btn btn-default" value="<?php eT("Next");?>" />
<input type="hidden" name="sid" value="<?php echo $iSurveyId;?>" />
<input type="hidden" name="action" value="quotas" />
<input type="hidden" name="subaction" value="insertquotaanswer" />
<input type="hidden" name="quota_qid" value="<?php echo sanitize_int($_POST['quota_qid']);?>" />
<input type="hidden" name="quota_id" value="<?php echo sanitize_int($_POST['quota_id']);?>" />
<br/>
<?php eT("Save this, then create another:");?>
<input type="checkbox" name="createanother">
</p>
</form>
</div>
<?php endif;?>
</div>
</div>
<input class="btn btn-lg btn-success" name="submit" type="submit" class="submit btn btn-default" value="<?php eT("Next");?>" />
<input type="hidden" name="sid" value="<?php echo $iSurveyId;?>" />
<input type="hidden" name="action" value="quotas" />
<input type="hidden" name="subaction" value="insertquotaanswer" />
<input type="hidden" name="quota_qid" value="<?php echo sanitize_int($_POST['quota_qid']);?>" />
<input type="hidden" name="quota_id" value="<?php echo sanitize_int($_POST['quota_id']);?>" />
<br/>
<?php eT("Save this, then create another:");?>
<input type="checkbox" name="createanother">
</p>
</form>
</div>
<?php endif;?>
</div>
</div>
</div>
12 changes: 6 additions & 6 deletions application/views/admin/quotas/newquota_view.php
@@ -1,9 +1,9 @@
<div class="side-body col-lg-8">
<div class="row">
<div class="col-lg-12 content-right">
<h3>
<?php eT("New quota");?>
</h3>
<div class="row">
<div class="col-lg-12 content-right">
<h3>
<?php eT("New quota");?>
</h3>

<?php echo CHtml::form(array("admin/quotas/sa/insertquota/surveyid/{$iSurveyId}"), 'post', array('class'=>'form30', 'id'=>'addnewquotaform', 'name'=>'addnewquotaform')); ?>
<ul>
Expand Down Expand Up @@ -58,5 +58,5 @@
<input type="hidden" name="subaction" value="insertquota" />
</div>

</form>
</form>
</div></div></div>

0 comments on commit 4be43c0

Please sign in to comment.