Skip to content

Commit

Permalink
Fixed issue #10159: icons & tooltip for language selector arrows
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Dec 17, 2015
1 parent 0ede52f commit 157cc12
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 30 deletions.
8 changes: 6 additions & 2 deletions application/views/admin/labels/editlabel_view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,13 @@

<!-- arrows -->
<td style="padding: 1em;">
<input type="button" class="btn btn-default btn-xs" value="<< <?php eT("Add"); ?>" onclick="DoAdd()" id="AddBtn" />
<button class="btn btn-default btn-xs" onclick="DoAdd()" id="AddBtn" type="button" data-toggle="tooltip" data-placement="top" title="<?php eT("Add"); ?>">
<span class="fa fa-long-arrow-left"></span>
</button>
<br /><br />
<input type="button" class="btn btn-default btn-xs" value="<?php eT("Remove"); ?> >>" onclick="DoRemove(1,'<?php eT("You cannot remove this item since you need at least one language in a labelset.", "js"); ?>')" id="RemoveBtn" />
<button class="btn btn-default btn-xs" type="button" onclick="DoRemove(1,'<?php eT("You cannot remove this item since you need at least one language in a labelset.", "js"); ?>')" id="RemoveBtn" data-toggle="tooltip" data-placement="bottom" title="<?php eT("Remove"); ?>" >
<span class="fa fa-long-arrow-right"></span>
</button>
</td>

<td>
Expand Down
61 changes: 34 additions & 27 deletions application/views/admin/survey/subview/accordion/_generaloptions_panel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
. "});\n";
Yii::app()->getClientScript()->registerScript('confirmLanguage',$sConfirmLanguage,CClientScript::POS_BEGIN);
?>

<!-- Base language -->
<div class="form-group">
<label class="col-sm-5 control-label" ><?php eT("Base language:") ; ?></label>
Expand All @@ -39,7 +39,7 @@
var mylangs = new Array();
standardtemplaterooturl='".$yii->getConfig('standardtemplaterooturl')."';
templaterooturl='".$yii->getConfig('usertemplaterooturl')."';\n";

foreach (Survey::model()->findByPk($surveyid)->additionalLanguages as $langname) {
if ($langname && $langname != $esrow['language']) {
$jsRemLang .=" mylangs[$jsX] = \"$langname\"\n"; ?>
Expand All @@ -50,18 +50,25 @@
}
$jsRemLang .= "</script>";
?>

</select>
<input type='hidden' name='languageids' id='languageids' value="<?php echo $esrow['additional_languages'];?>" />
</td>

<!-- Arrows -->
<td style='text-align:left'>
<div class="col-sm-4">
<input class="btn btn-default" type="button" value="<< <?php eT("Add"); ?>" onclick="DoAdd()" id="AddBtn" /><br />
<input class="btn btn-default" type="button" value="<?php eT("Remove"); ?> >>" onclick="DoRemove(0,'')" id="RemoveBtn" />
<button class="btn btn-default btn-xs" onclick="DoAdd()" id="AddBtn" type="button" data-toggle="tooltip" data-placement="top" title="<?php eT("Add"); ?>">
<span class="fa fa-long-arrow-left"></span>
</button>
<br /><br />
<button class="btn btn-default btn-xs" type="button" onclick="DoRemove(0,'')" id="RemoveBtn" data-toggle="tooltip" data-placement="bottom" title="<?php eT("Remove"); ?>" >
<span class="fa fa-long-arrow-right"></span>
</button>
</div>
</td>


<td style='text-align:left'>
<select class="form-control input-xlarge" size='5' id='available_languages' name='available_languages'>
<?php $tempLang=Survey::model()->findByPk($surveyid)->additionalLanguages;
Expand All @@ -78,38 +85,38 @@
<br/>
</div>
</div>

<!-- Administrator -->
<div class="form-group">
<label class="col-sm-3 control-label" for='admin'><?php eT("Administrator:"); ?></label>
<div class="col-sm-9">
<input class="form-control" type='text' size='50' id='admin' name='admin' value="<?php echo htmlspecialchars($esrow['admin']); ?>" />
<input class="form-control" type='text' size='50' id='admin' name='admin' value="<?php echo htmlspecialchars($esrow['admin']); ?>" />
</div>
</div>

<!-- Admin email -->
<div class="form-group">
<label class="col-sm-3 control-label" for='adminemail'><?php eT("Admin email:"); ?></label>
<div class="col-sm-9">
<input class="form-control" type='email' size='50' id='adminemail' name='adminemail' value="<?php echo htmlspecialchars($esrow['adminemail']); ?>" />
<input class="form-control" type='email' size='50' id='adminemail' name='adminemail' value="<?php echo htmlspecialchars($esrow['adminemail']); ?>" />
</div>
</div>

<!-- Bounce email -->
<div class="form-group">
<label class="col-sm-3 control-label" for='bounce_email'><?php eT("Bounce email:"); ?></label>
<div class="col-sm-9">
<input class="form-control" type='email' size='50' id='bounce_email' name='bounce_email' value="<?php echo htmlspecialchars($esrow['bounce_email']); ?>" />
<input class="form-control" type='email' size='50' id='bounce_email' name='bounce_email' value="<?php echo htmlspecialchars($esrow['bounce_email']); ?>" />
</div>
</div>

<!-- Fax to -->
<div class="form-group">
<label class="col-sm-3 control-label" for='faxto'><?php eT("Fax to:"); ?></label>
<div class="col-sm-9">
<input class="form-control" type='text' size='50' id='faxto' name='faxto' value="<?php echo htmlspecialchars($esrow['faxto']); ?>" />
</div>
</div>
</div>

<?php else: ?>
<!-- End URL -->
Expand All @@ -118,61 +125,61 @@
<div class="col-sm-9">
<input type='text' class="form-control" id='url' name='url' placeholder="http://your.redirection.com" />
</div>
</div>
</div>

<!-- URL description -->
<!-- URL description -->
<div class="form-group">
<label class="col-sm-3 control-label" for='urldescrip'><?php eT("URL description:") ; ?></label>
<div class="col-sm-9">
<input type='text' maxlength='255' size='50' id='urldescrip' name='urldescrip' value='' class="form-control" placeholder="<?php eT('describe this redirection');?>" />
</div>
</div>

<!-- Date format -->
<!-- Date format -->
<div class="form-group">
<label class="col-sm-3 control-label" for='dateformat'><?php eT("Date format:") ; ?></label>
<div class="col-sm-3">
<?php echo CHtml::listBox('dateformat',$sDateFormatDefault, $aDateFormatData, array('id'=>'dateformat','size'=>'1', 'class'=>'form-control')); ?>
</div>
</div>
<!-- Decimal mark -->

<!-- Decimal mark -->
<div class="form-group">
<label class="col-sm-3 control-label" for='numberformat'><?php eT("Decimal mark:"); ?></label>
<div class="col-sm-3">
<?php echo CHtml::listBox('numberformat',$sRadixDefault, $aRadixPointData, array('id'=>'numberformat','size'=>'1', 'class'=>'form-control')); ?>
</div>
</div>

<!-- Administrator -->
<!-- Administrator -->
<div class="form-group">
<label class="col-sm-3 control-label" for='admin'><?php eT("Administrator:") ; ?></label>
<div class="col-sm-9">
<input type='text' size='50' id='admin' name='admin' class="form-control" value='<?php echo $owner['full_name'] ; ?>' />
</div>
</div>

<!-- Admin email -->
<div class="form-group">
<!-- Admin email -->
<div class="form-group">
<label class="col-sm-3 control-label" for='adminemail'><?php eT("Admin email:") ; ?></label>
<div class="col-sm-9">
<input type='email' size='30' class="form-control" id='adminemail' name='adminemail' value='<?php echo $owner['email'] ; ?>' />
</div>
</div>

<!-- Bounce Email -->
<!-- Bounce Email -->
<div class="form-group">
<label class="col-sm-3 control-label" for='bounce_email'><?php eT("Bounce Email:") ; ?></label>
<div class="col-sm-9">
<input type='email' size='50' class="form-control" id='bounce_email' name='bounce_email' value='<?php echo $owner['bounce_email'] ; ?>' />
</div>
</div>

<!-- Fax to -->
<!-- Fax to -->
<div class="form-group">
<label class="col-sm-3 control-label" for='faxto'><?php eT("Fax to:") ; ?></label>
<div class="col-sm-9">
<input type='text' size='50' id='faxto' name='faxto' class="form-control" />
</div>
</div>
<?php endif;?>
</div>
<?php endif;?>
12 changes: 11 additions & 1 deletion application/views/admin/survey/subview/tabGeneralEditSurvey_view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,17 @@
</select>
<?php echo $jsRemLang; ?>
</td>
<td style='text-align:left'><input type="button" value="<< <?php eT("Add"); ?>" onclick="DoAdd()" id="AddBtn" /><br /> <input type="button" value="<?php eT("Remove"); ?> >>" onclick="DoRemove(0,'')" id="RemoveBtn" /></td>

<!-- Arrows -->
<td style='text-align:left'>
<button class="btn btn-default btn-xs" onclick="DoAdd()" id="AddBtn" type="button" data-toggle="tooltip" data-placement="top" title="<?php eT("Add"); ?>">
<span class="fa fa-long-arrow-left"></span>
</button>
<br /><br />
<button class="btn btn-default btn-xs" type="button" onclick="DoRemove(0,'')" id="RemoveBtn" data-toggle="tooltip" data-placement="bottom" title="<?php eT("Remove"); ?>" >
<span class="fa fa-long-arrow-right"></span>
</button>
</td>


<td style='text-align:left'><select size='5' style='min-width:220px;' id='available_languages' name='available_languages'>
Expand Down

0 comments on commit 157cc12

Please sign in to comment.