Skip to content

Commit

Permalink
Dev: Style fixes for Edit question and Add question tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
@olleharstedt
olleharstedt committed Sep 28, 2015
1 parent 6f83af8 commit 9c3ac19
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 42 deletions.
55 changes: 28 additions & 27 deletions application/views/admin/survey/Question/newQuestion_subviews/_tabs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,58 +31,59 @@
<div id="<?php echo $eqrow['language']; ?>" class="tab-pane fade in active">

<!-- Question Code -->
<div class="form-group col-sm-12" style="padding-left: 0px;">
<label class="col-sm-1 control-label" for='title' style="padding-left: 0px;">
<?php eT("Code:"); ?>
</label>
<div class="col-sm-4" style="padding-left: 0px;">
<input type='text' autofocus="autofocus" size='20' maxlength='20' id='title' required='required' name='title' pattern='<?php echo $sPattern ?>' value="<?php echo $eqrow['title']; ?>" />
</div>
<div class="col-sm-1" style="padding-left: 0px;">
<span class='text-warning'><?php eT("Required"); ?> </span>
<div class="form-group">
<div class="col-lg-offset-1">
<label class="col-sm-1 control-label" for='title'><?php eT("Code:"); ?></label>

<div class="col-sm-5">
<input class="form-control" type='text' autofocus="autofocus" size='20' maxlength='20' id='title' required='required' name='title' pattern='<?php echo $sPattern ?>' value="<?php echo $eqrow['title']; ?>" />
</div>
<div class="col-sm-6">
<span class='text-warning'><?php eT("Required"); ?> </span>
</div>
</div>
</div>

<!-- Question Text -->
<div class="form-group">
<label for='question_<?php echo $eqrow['language']; ?>' class=""> <?php eT("Question:"); ?></label>
<div class='htmleditor' >
<textarea cols='80' rows='100' id='question_<?php echo $eqrow['language']; ?>' name='question_<?php echo $eqrow['language']; ?>'><?php echo $eqrow['question']; ?></textarea>
<div class="col-lg-offset-1">
<label class="control-label" for='question_<?php echo $eqrow['language']; ?>' class=""> <?php eT("Question:"); ?></label>
<textarea cols='80' rows='100' id='question_<?php echo $eqrow['language']; ?>' name='question_<?php echo $eqrow['language']; ?>'><?php echo $eqrow['question']; ?></textarea>
<?php echo getEditor("question-text","question_".$eqrow['language'], "[".gT("Question:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?>
</div>
<?php echo getEditor("question-text","question_".$eqrow['language'], "[".gT("Question:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?>
</div>

<!-- Question Help -->
<div class="form-group">
<label for='help_<?php echo $eqrow['language']; ?>' class=""><?php eT("Help:"); ?></label>

<div class='htmleditor' >
<textarea cols='45' rows='4' id='help_<?php echo $eqrow['language']; ?>' name='help_<?php echo $eqrow['language']; ?>'><?php echo $eqrow['help']; ?></textarea>
<div class="col-lg-offset-1">
<label class="control-label" for='help_<?php echo $eqrow['language']; ?>' class=""><?php eT("Help:"); ?></label>
<textarea cols='45' rows='4' id='help_<?php echo $eqrow['language']; ?>' name='help_<?php echo $eqrow['language']; ?>'><?php echo $eqrow['help']; ?></textarea>
<?php echo getEditor("question-help","help_".$eqrow['language'], "[".gT("Help:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?>
</div>
<?php echo getEditor("question-help","help_".$eqrow['language'], "[".gT("Help:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?>
</div>
</div>

<!-- Other languages tab-panes -->
<?php foreach ($addlanguages as $addlanguage): ?>
<div id="<?php echo $addlanguage; ?>" class="tab-pane fade">


<!-- Question Text -->
<div class="form-group">
<label for='question_<?php echo $addlanguage; ?>'><?php eT("Question:"); ?></label>
<div class='htmleditor' >
<textarea cols='80' rows='4' id='question_<?php echo $addlanguage; ?>' name='question_<?php echo $addlanguage; ?>'></textarea>
<div class="col-lg-offset-1">
<label class="control-label" for='question_<?php echo $addlanguage; ?>'><?php eT("Question:"); ?></label>
<div class='htmleditor' >
<textarea cols='80' rows='4' id='question_<?php echo $addlanguage; ?>' name='question_<?php echo $addlanguage; ?>'></textarea>
</div>
<?php echo getEditor("question-text","question_".$addlanguage, "[".gT("Question:", "js")."](".$addlanguage.")",$surveyid,$gid,$qid,$action); ?>
</div>
<?php echo getEditor("question-text","question_".$addlanguage, "[".gT("Question:", "js")."](".$addlanguage.")",$surveyid,$gid,$qid,$action); ?>
</div>

<!-- Question Help -->
<div class="form-group">
<label for='help_<?php echo $addlanguage; ?>'><?php eT("Help:"); ?></label>
<div class='htmleditor'>
<div class="col-lg-offset-1">
<label for='help_<?php echo $addlanguage; ?>'><?php eT("Help:"); ?></label>
<textarea cols='45' rows='4' id='help_<?php echo $addlanguage; ?>' name='help_<?php echo $addlanguage; ?>'></textarea>
<?php echo getEditor("question-help","help_".$addlanguage, "[".gT("Help:", "js")."](".$addlanguage.")",$surveyid,$gid,$qid,$action); ?>
<?php echo getEditor("question-help","help_".$addlanguage, "[".gT("Help:", "js")."](".$addlanguage.")",$surveyid,$gid,$qid,$action); ?>
</div>
</div>
</div>
Expand All @@ -93,4 +94,4 @@
<div id='questionactioncopy' class='extra-action'>
<button type='submit' class="saveandreturn hidden" name="redirection" value="edit"><?php eT("Save") ?> </button>
<input type='submit' class="hidden" value='<?php eT("Save and close"); ?>' />
</div>
</div>
22 changes: 7 additions & 15 deletions application/views/admin/survey/Question/question_subviews/_tabs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
<div id="<?php echo $eqrow['language']; ?>" class="tab-pane fade in active">

<!-- Question Code -->
<div class="form-group" style="">
<div class="form-group">
<div class="col-lg-offset-1">
<label class="col-sm-1 control-label" for='title'><?php eT("Code:"); ?></label>

<div class="col-sm-5" style="">
<div class="col-sm-5">
<input class="form-control" type='text' autofocus="autofocus" size='20' maxlength='20' id='title' required='required' name='title' pattern='<?php echo $sPattern ?>' value="<?php echo $eqrow['title']; ?>" />
</div>

<div class="col-sm-6" style="">
<div class="col-sm-6">
<span class='text-warning'><?php eT("Required"); ?> </span>
</div>
</div>
Expand All @@ -50,12 +50,8 @@
<div class="col-lg-offset-1">
<label class="control-label" for='question_<?php echo $eqrow['language']; ?>' class=""><?php eT("Question:"); ?></label>

<div class="">
<div class=''>
<textarea cols='80' rows='100' id='question_<?php echo $eqrow['language']; ?>' name='question_<?php echo $eqrow['language']; ?>'><?php echo $eqrow['question']; ?></textarea>
</div>
<?php echo getEditor("question-text","question_".$eqrow['language'], "[".gT("Question:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?>
</div>
<textarea cols='80' rows='100' id='question_<?php echo $eqrow['language']; ?>' name='question_<?php echo $eqrow['language']; ?>'><?php echo $eqrow['question']; ?></textarea>
<?php echo getEditor("question-text","question_".$eqrow['language'], "[".gT("Question:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?>
</div>
</div>

Expand All @@ -64,12 +60,8 @@
<div class="col-lg-offset-1">
<label class="control-label" for='help_<?php echo $eqrow['language']; ?>'><?php eT("Help:"); ?></label>

<div class="">
<div class='' >
<textarea cols='45' rows='4' id='help_<?php echo $eqrow['language']; ?>' name='help_<?php echo $eqrow['language']; ?>'><?php echo $eqrow['help']; ?></textarea>
</div>
<?php echo getEditor("question-help","help_".$eqrow['language'], "[".gT("Help:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?>
</div>
<textarea cols='45' rows='4' id='help_<?php echo $eqrow['language']; ?>' name='help_<?php echo $eqrow['language']; ?>'><?php echo $eqrow['help']; ?></textarea>
<?php echo getEditor("question-help","help_".$eqrow['language'], "[".gT("Help:", "js")."](".$eqrow['language'].")",$surveyid,$gid,$qid,$action); ?>
</div>
</div>
</div>
Expand Down

0 comments on commit 9c3ac19

Please sign in to comment.