Skip to content

Commit

Permalink
Dev Text fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
c-schmitz committed Mar 21, 2016
1 parent da81be9 commit 2797348
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion application/controllers/admin/surveyadmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ public function copy()
$aImportResults=importSurveyFile($sFullFilepath,(isset($_POST['translinksfields'])));
if (is_null($aImportResults) || !empty($aImportResults['error']))
{
$aData['sErrorMessage']=isset($aImportResults['error']) ? $aImportResults['error'] : gT("Unknow error.");
$aData['sErrorMessage']=isset($aImportResults['error']) ? $aImportResults['error'] : gT("Unknown error.");
$aData['bFailed'] = true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/dataentry/active_html_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function saveshow(value)
<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>
<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>
Expand Down Expand Up @@ -112,6 +112,6 @@ function saveshow(value)
</tr>
</table>
</form>


</div></div></div>
34 changes: 17 additions & 17 deletions application/views/admin/dataentry/insert.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="col-lg-12 content-right">

<div class="jumbotron message-box <?php if($errormsg){echo 'message-box-error';}?>">

<?php if($errormsg): ?>
<h2 class="danger"><?php eT("Try again"); ?>:</h2>
<p>
Expand All @@ -22,7 +22,7 @@
</td>
</tr>
<tr>
<td align='right'><?php eT("Confirm Password:"); ?></td>
<td align='right'><?php eT("Confirm password:"); ?></td>
<td>
<?php echo CHtml::passwordField('save_confirmpassword',$_POST['save_confirmpassword']);?>
</td>
Expand Down Expand Up @@ -50,27 +50,27 @@
</td>
<?php
echo $hiddenfields;
if (isset($_POST['datestamp']))
if (isset($_POST['datestamp']))
{
echo CHtml::hiddenField('datestamp', $_POST['datestamp']);
}

if (isset($_POST['ipaddr']))
{
echo CHtml::hiddenField('ipaddr', $_POST['ipaddr']);
}
?>
</tr>
</table>
</form>
</form>
</p>
<p>
<?php
foreach($dataentrymsgs as $msg)
foreach($dataentrymsgs as $msg)
{
echo $msg . "<br />\n";
}
?>
?>
</p>
<p>
<?php echo $errormsg; ?>
Expand All @@ -79,22 +79,22 @@
<input type='submit' class="btn btn-lg btn-default" value='<?php eT("Add another record"); ?>' onclick="window.open('<?php echo $this->createUrl('/admin/dataentry/sa/view/surveyid/'.$surveyid.'/lang/'.$lang); ?>', '_top')" />
<br /><br />
<input type='submit' class="btn btn-lg btn-default" value='<?php eT("Return to survey administration"); ?>' onclick="window.open('<?php echo $this->createUrl('admin/survey/sa/view/surveyid/'.$surveyid); ?>', '_top')" />
<br /><br />
<br /><br />
</p>
<p>
<?php if(isset($save)): ?>
<input type='submit' class="btn btn-lg btn-default" value='<?php eT("Browse saved responses"); ?>' onclick="window.open('<?php echo $this->createUrl('/admin/saved/sa/view/surveyid/'.$surveyid.'/all'); ?>', '_top')" />
<br /><br />
<?php endif; ?>
</p>
<?php endif; ?>
</p>
<?php else:?>

<!-- SUCCESS -->

<h2 class="success"><?php eT("Success"); ?></h2>
<p>
<?php
foreach($dataentrymsgs as $msg)
foreach($dataentrymsgs as $msg)
{
echo $msg . "<br />\n";
}
Expand All @@ -103,19 +103,19 @@
<p>
<?php if(isset($thisid)): ?>
<?php echo gT("The entry was assigned the following record id: ")."{$thisid}"; ?> <br /><br />
<?php endif; ?>
<?php endif; ?>
</p>
<p>
<p>
<input type='submit' class="btn btn-lg btn-default" value='<?php eT("Add another record"); ?>' onclick="window.open('<?php echo $this->createUrl('/admin/dataentry/sa/view/surveyid/'.$surveyid.'/lang/'.$lang); ?>', '_top')" />
<br /><br />
<input type='submit' class="btn btn-lg btn-default" value='<?php eT("Return to survey administration"); ?>' onclick="window.open('<?php echo $this->createUrl('admin/survey/sa/view/surveyid/'.$surveyid); ?>', '_top')" />
<br /><br />

<?php if(isset($thisid) && Permission::model()->hasSurveyPermission($surveyid, 'responses','read')): ?>
<input type='submit' class="btn btn-lg btn-default" value='<?php eT("View this record"); ?>' onclick="window.open('<?php echo $this->createUrl('/admin/responses/sa/view/surveyid/'.$surveyid.'/id/'.$thisid); ?>', '_top')" />
<br /><br />
<?php endif; ?>

<?php if(isset($save)): ?>
<input type='submit' class="btn btn-lg btn-default" value='<?php eT("Browse saved responses"); ?>' onclick="window.open('<?php echo $this->createUrl('/admin/saved/sa/view/surveyid/'.$surveyid.'/all'); ?>', '_top')" />
<br /><br />
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/quotas/newanswererror_view.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="jumbotron message-box message-box-error">
<h2><?php eT("Add answer");?>: <?php eT("Question Selection");?></h2>
<h2><?php eT("Add answer");?>: <?php eT("Question selection");?></h2>
<p class="lead"><?php eT("Sorry there are no supported question types in this survey.");?></p>
<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");?>"/>
Expand Down
6 changes: 3 additions & 3 deletions application/views/admin/quotas/newanswertwo_view.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="side-body col-lg-8">
<div class="row">
<div class="row">
<div class="col-lg-12 content-right">
<h3>
<?php eT("Survey quota");?>: <?php eT("Add answer");?>
Expand All @@ -11,11 +11,11 @@
<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>
</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>
<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">
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/quotas/viewquotasfooter_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<td style="padding: 3px;">
<?php if (Permission::model()->hasSurveyPermission($iSurveyId, 'quotas','create')) { ?>
<?php echo CHtml::form(array("admin/quotas/sa/newquota/surveyid/{$iSurveyId}"), 'post'); ?>
<input name="submit" type="submit" class="quota_new btn btn-default" value="<?php eT("Add New Quota");?>" />
<input name="submit" type="submit" class="quota_new btn btn-default" value="<?php eT("Add new quota");?>" />
<input type="hidden" name="sid" value="<?php echo $iSurveyId;?>" />
<input type="hidden" name="action" value="quotas" />
<input type="hidden" name="subaction" value="new_quota" />
</form>

<?php } ?>
<?php } ?>
</td>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/quotas/viewquotasrow_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{
echo '<font color="#48B150">'.gT("Active").'</font>';
} else {
echo '<font color="#B73838">'.gT("Not Active").'</font>';
echo '<font color="#B73838">'.gT("Not active").'</font>';
}
?>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<table width='100%' align='center' border='0' bgcolor='#EFEFEF'>
<tr>
<td align='center'>
<?php eT("Showing Filtered Results"); ?><br />
<?php eT("Showing filtered results"); ?><br />
[<a href="javascript:window.close()"><?php eT("Close"); ?></a>]
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/responses/browsemenubar_view.php
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@

<a class="btn btn-default" href='<?php echo $this->createUrl("admin/export/sa/exportresults/surveyid/$surveyid/id/$id"); ?>' role="button" >
<span class="icon-export text-success downloadfile"></span>
<?php eT("Export this Response"); ?>
<?php eT("Export this response"); ?>
</a>
<?php endif;?>

Expand Down
6 changes: 3 additions & 3 deletions application/views/admin/saved/savedlist_view.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="side-body">
<h3>
<span style='font-weight:bold;'><?php eT('Saved Responses'); ?></span>
<span style='font-weight:bold;'><?php eT('Saved responses'); ?></span>
<?php echo $sSurveyName . ' ' . sprintf(gT('ID: %s'), $iSurveyId); ?>
</h3>

<div class="row">
<div class="col-lg-12 content-right">
<div class="alert alert-info" role="alert">
<?php eT('Saved Responses:'); ?> <?php echo getSavedCount($iSurveyId); ?>
<?php eT('Total:'); ?> <?php echo getSavedCount($iSurveyId); ?>
</div>

<p>
Expand All @@ -18,7 +18,7 @@
<th><?php eT('Actions'); ?></th>
<th><?php eT('Identifier'); ?></th>
<th><?php eT('IP address'); ?></th>
<th><?php eT('Date Saved'); ?></th>
<th><?php eT('Date saved'); ?></th>
<th><?php eT('Email address'); ?></th>
</tr>
</thead>
Expand Down

0 comments on commit 2797348

Please sign in to comment.