Skip to content

Commit

Permalink
Dev: working on admin 508 (#729)
Browse files Browse the repository at this point in the history
  • Loading branch information
@billdacat @Shnoulle
billdacat authored and Shnoulle committed Jul 4, 2017
1 parent d97c729 commit 07c899a
Show file tree
Hide file tree
Showing 20 changed files with 69 additions and 55 deletions.
4 changes: 2 additions & 2 deletions application/views/admin/dataentry/vvimport.php
View file
Expand Up @@ -13,9 +13,9 @@

<div class="panel panel-primary" id="panel-1">
<div class="panel-heading">
<h4 class="panel-title">
<div class="panel-title h4">
<?php eT("General");?>
</h4>
</div>
</div>

<div class="panel-body">
Expand Down
28 changes: 14 additions & 14 deletions application/views/admin/export/exportresults_view.php
View file
Expand Up @@ -28,9 +28,9 @@
<!-- Format -->
<div class="panel panel-primary" id="panel-1">
<div class="panel-heading">
<h4 class="panel-title">
<div class="panel-title h4">
<?php eT("Format");?>
</h4>
</div>
</div>
<div class="panel-body">
<div class="form-group">
Expand All @@ -54,9 +54,9 @@
<!-- Range -->
<div class="panel panel-primary" id="panel-2" <?php if ($SingleResponse) { echo 'style="display:none"';} ?> >
<div class="panel-heading">
<h4 class="panel-title">
<div class="panel-title h4">
<?php eT("Range");?>
</h4>
</div>
</div>
<div class="panel-body">
<div class="form-group">
Expand Down Expand Up @@ -101,9 +101,9 @@ class="form-control"
<!-- General -->
<div class="panel panel-primary" id="panel-3">
<div class="panel-heading">
<h4 class="panel-title">
<div class="panel-title h4">
<?php eT("General"); ?>
</h4>
</div>
</div>
<div class="panel-body">
<div class="form-group">
Expand Down Expand Up @@ -132,9 +132,9 @@ class="form-control"
<!-- Heading -->
<div class="panel panel-primary" id="panel-4">
<div class="panel-heading">
<h4 class="panel-title">
<div class="panel-title h4">
<?php eT("Headings");?>
</h4>
</div>
</div>
<div class="panel-body">

Expand Down Expand Up @@ -242,9 +242,9 @@ class="form-control"

<div class="panel panel-primary" id="panel-5">
<div class="panel-heading">
<h4 class="panel-title">
<div class="panel-title h4">
<?php eT("Responses");?>
</h4>
</div>
</div>
<div class="panel-body">
<!-- Answer codes / Full answers -->
Expand Down Expand Up @@ -292,9 +292,9 @@ class="form-control"
<!-- Column control -->
<div class="panel panel-primary" id="panel-6">
<div class="panel-heading">
<h4 class="panel-title">
<div class="panel-title h4">
<?php eT("Columns");?>
</h4>
</div>
</div>
<div class="panel-body">
<input type='hidden' name='sid' value='<?php echo $surveyid; ?>' />
Expand All @@ -320,9 +320,9 @@ class="form-control"
<?php if ($thissurvey['anonymized'] == "N" && tableExists("{{tokens_$surveyid}}") && Permission::model()->hasSurveyPermission($surveyid,'tokens','read')): ?>
<div class="panel panel-primary" id="panel-7">
<div class="panel-heading">
<h4 class="panel-title">
<div class="panel-title h4">
<?php eT("Token control");?>
</h4>
</div>
</div>
<div class="panel-body">
<div class="alert alert-info alert-dismissible" role="alert">
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/export/statistics_subviews/_dataselection.php
View file
@@ -1,6 +1,6 @@
<div class="panel panel-primary" id="panel-1">
<div class="panel-heading">
<h4 class="panel-title"><?php eT("Data selection"); ?></h4>
<div class="panel-title h4"><?php eT("Data selection"); ?></div>
</div>

<div class="panel-body">
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/export/statistics_subviews/_outputformat.php
View file
@@ -1,6 +1,6 @@
<div class="panel panel-primary " id="panel-1">
<div class="panel-heading">
<h4 class="panel-title"><?php eT("Output format"); ?></h4>
<div class="panel-title h4"><?php eT("Output format"); ?></div>
</div>
<div class="panel-body">
<div class="btn-group" data-toggle="buttons">
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/export/statistics_subviews/_outputoptions.php
View file
@@ -1,6 +1,6 @@
<div class="panel panel-primary" id="panel-1">
<div class="panel-heading">
<h4 class="panel-title"><?php eT("Output options"); ?></h4>
<div class="panel-title h4"><?php eT("Output options"); ?></div>
</div>
<div class="panel-body">
<div class='form-group'>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/export/statistics_subviews/_responseid.php
View file
@@ -1,6 +1,6 @@
<div class="panel panel-primary" id="panel-1">
<div class="panel-heading">
<h4 class="panel-title"><?php eT("Response ID"); ?></h4>
<div class="panel-title h4"><?php eT("Response ID"); ?></div>
</div>
<div class="panel-body">
<div class='form-group'>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/export/statistics_subviews/_submissiondate.php
View file
@@ -1,7 +1,7 @@
<?php if (isset($datestamp) && $datestamp == "Y"): ?>
<div class="panel panel-primary " id="panel-1">
<div class="panel-heading">
<h4 class="panel-title"><?php eT("Submission date"); ?></h4>
<div class="panel-title h4"><?php eT("Submission date"); ?></div>
</div>
<div class="panel-body">
<div class='form-group'>
Expand Down
8 changes: 4 additions & 4 deletions application/views/admin/export/vv_view.php
View file
Expand Up @@ -7,9 +7,9 @@

<div class="panel panel-primary" id="panel-1" style="opacity: 1; top: 0px;">
<div class="panel-heading">
<h4 class="panel-title">
<div class="panel-title h4">
<?php eT("Export survey");?>
</h4>
</div>
</div>

<div class="panel-body">
Expand Down Expand Up @@ -67,9 +67,9 @@

<div class="panel panel-primary" id="panel-1" style="opacity: 1; top: 0px;">
<div class="panel-heading">
<h4 class="panel-title">
<div class="panel-title h4">
<?php eT("Format");?>
</h4>
</div>
</div>
<div class="panel-body">
<div class="form-group">
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/labels/_labelviewrightcontent_view.php
View file
Expand Up @@ -5,11 +5,11 @@

<!-- Uploaded resources management -->
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<div class="panel-title h4">
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
<?php eT("Uploaded resources management"); ?>
</a>
</h4>
</div>
</div> <!-- headingOne -->

<!-- Body -->
Expand Down
5 changes: 3 additions & 2 deletions application/views/admin/survey/Question/advanced_settings_view.php
View file
Expand Up @@ -17,14 +17,15 @@
<?php endif; ?>
<div class="panel panel-default panel-advancedquestionsettings">
<div class="panel-heading" role="tab">
<h4 class="panel-title">
<div class="panel-title h4">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="fa fa-chevron-left"></span>
<span class="sr-only"><?php eT("Expand/Collapse");?></span>
</a>
<a id="button-collapse<?php echo $categoryNum ?>" class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-cat<?php echo $categoryNum ?>" aria-expanded="false" aria-controls="collapse-cat<?php echo $categoryNum ?>">
<?php echo $aAttribute['category']; ?>
</a>
</h4>
</div>
</div>
<div id="collapse-cat<?php echo $categoryNum ?>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="button-collapse<?php echo $categoryNum ?>">
<div class="panel-body">
Expand Down
10 changes: 6 additions & 4 deletions application/views/admin/survey/Question/editQuestion_view.php
View file
Expand Up @@ -90,14 +90,15 @@
<?php if ($copying): ?>
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="heading-copy">
<h4 class="panel-title">
<div class="panel-title h4">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="fa fa-chevron-left"></span>
<span class="sr-only"><?php eT("Expand/Collapse");?></span>
</a>
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-copy" aria-expanded="false" aria-controls="collapse-copy">
<?php eT("Copy options"); ?>
</a>
</h4>
</div>
</div>
<div id="collapse-copy" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading-copy">
<div class="panel-body">
Expand Down Expand Up @@ -147,14 +148,15 @@

<!-- General Options : Header -->
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<div class="panel-title h4">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="fa fa-chevron-left"></span>
<span class="sr-only"><?php eT("Expand/Collapse");?></span>
</a>
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-question" aria-expanded="true" aria-controls="collapse-question">
<?php eT("General options");?>
</a>
</h4>
</div>
</div>

<div id="collapse-question" class="panel-collapse collapse <?php if (!$copying){echo ' in '; } ?>" role="tabpanel" aria-labelledby="headingOne">
Expand Down
8 changes: 4 additions & 4 deletions application/views/admin/survey/Question/question_subviews/_accordion_container.php
View file
Expand Up @@ -2,14 +2,14 @@
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
<div class="panel panel-default" id="questionTypeContainer">
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<div class="panel-title h4">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="fa fa-chevron-left"></span>
</a>
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
<?php eT("General options");?>
</a>
</h4>
</div>
</div>
<div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body">
Expand Down Expand Up @@ -122,14 +122,14 @@

<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingTwo">
<h4 class="panel-title">
<div class="panel-title h4">
<a class="btn btn-default btn-xs hide-button hidden-xs opened handleAccordion">
<span class="fa fa-chevron-left"></span>
</a>
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
<?php eT("Advanced settings"); ?>
</a>
</h4>
</div>
</div>
<div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
<div class="panel-body">
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/survey/Question/question_subviews/_tabs.php
View file
Expand Up @@ -9,7 +9,7 @@
<!-- New question language tabs -->
<ul class="nav nav-tabs" style="margin-right: 8px;" >
<li role="presentation" class="active">
<a data-toggle="tab" href="#<?php echo $eqrow['language']; ?>">
<a role="tab" data-toggle="tab" href="#<?php echo $eqrow['language']; ?>">
<?php echo getLanguageNameFromCode($eqrow['language'],false); ?> (<?php eT("Base language"); ?>)
</a>
</li>
Expand Down
6 changes: 3 additions & 3 deletions application/views/admin/survey/Question/question_view.php
View file
@@ -1,6 +1,6 @@
<div class='side-body <?php echo getSideBodyClass(true); ?>'>
<?php $this->renderPartial('/admin/survey/breadcrumb', array('oQuestion'=>$oQuestion)); ?>
<h3><?php eT('Question summary'); ?> <small><em><?php echo $qrrow['title'];?></em> (ID: <?php echo $qid;?>)</small></h3>
<div class="pagetitle h3"><?php eT('Question summary'); ?> <small><em><?php echo $qrrow['title'];?></em> (ID: <?php echo $qid;?>)</small></div>
<div class="row">
<div class="col-lg-12 content-right">

Expand Down Expand Up @@ -197,15 +197,15 @@

<!-- Quick Actions -->
<?php if (Permission::model()->hasSurveyPermission($iSurveyId, 'surveycontent', 'update')): ?>
<h3 id="survey-action-title"><?php eT('Question quick actions'); ?></h3>
<div id="survey-action-title" class="pagetitle h3"><?php eT('Question quick actions'); ?></div>
<div class="row welcome survey-action">
<div class="col-lg-12 content-right">

<!-- create question in this group -->
<div class="col-lg-3">
<div class="panel panel-primary <?php if ($surveyIsActive) { echo 'disabled'; } else { echo 'panel-clickable'; } ?>" id="panel-1" data-url="<?php echo $this->createUrl('admin/questions/sa/newquestion/surveyid/'.$surveyid.'/gid/'.$gid); ?>">
<div class="panel-heading">
<h4 class="panel-title"><?php eT("Add new question to group");?></h4>
<div class="panel-title h4"><?php eT("Add new question to group");?></div>
</div>
<div class="panel-body">
<span class="icon-add text-success" style="font-size: 3em;"></span>
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/survey/QuestionGroups/addGroup_view.php
View file
Expand Up @@ -11,14 +11,14 @@

<?php echo PrepareEditorScript(false, $this); $active = 1;?>
<div id='edit-survey-text-element' class='side-body <?php echo getSideBodyClass(false); ?>'>
<h3><?php eT("Add question group"); ?></h3>
<div class="pagetitle h3"><?php eT("Add question group"); ?></div>
<div class="row">

<!-- Tabs -->
<ul class="nav nav-tabs" >
<?php foreach ($grplangs as $grouplang): ?>
<li role="presentation" class="<?php if($active){ echo 'active'; $active=0; }?>">
<a data-toggle="tab" href="#<?php echo $grouplang; ?>">
<a role="tab" data-toggle="tab" href="#<?php echo $grouplang; ?>">
<?php echo getLanguageNameFromCode($grouplang,false);
if ($grouplang==$baselang) { ?> (<?php eT("Base language"); ?>) <?php } ?>
</a>
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/survey/QuestionGroups/editGroup_view.php
View file
Expand Up @@ -6,11 +6,11 @@
<div class="row">
<div class="col-sm-12 content-right">
<?php $this->renderPartial('/admin/survey/breadcrumb', array('oQuestionGroup'=>$oQuestionGroup, 'active'=>gT("Edit Group"))); ?>
<h3><?php eT("Edit Group"); ?></h3>
<div class="pagetitle h3"><?php eT("Edit Group"); ?></div>
<ul class="nav nav-tabs" id="edit-group-language-selection">
<?php foreach ($tabtitles as $i=>$eachtitle):?>
<li role="presentation" class="<?php if($count==0) {echo "active"; $count++;}?>">
<a data-toggle="tab" href="#editgrp_<?php echo $i;?>">
<a role="tab" data-toggle="tab" href="#editgrp_<?php echo $i;?>">
<?php echo $eachtitle;?>
</a>
</li>
Expand Down
6 changes: 3 additions & 3 deletions application/views/admin/survey/QuestionGroups/group_view.php
View file
@@ -1,6 +1,6 @@
<div class='side-body <?php echo getSideBodyClass(true); ?>'>
<?php $this->renderPartial('/admin/survey/breadcrumb', array('oQuestionGroup'=>$oQuestionGroup)); ?>
<h3><?php eT('Group summary'); ?></h3>
<div class="pagetitle h3"><?php eT('Group summary'); ?></div>
<div class="row">
<div class="col-lg-12 content-right">

Expand Down Expand Up @@ -64,15 +64,15 @@
</div>

<?php if (Permission::model()->hasSurveyPermission($iSurveyId, 'surveycontent', 'update')): ?>
<h3 id="survey-action-title"><?php eT('Group quick actions'); ?></h3>
<div id="survey-action-title" class="pagetitle h3"><?php eT('Group quick actions'); ?></div>
<div class="row welcome survey-action">
<div class="col-lg-12 content-right">

<!-- create question in this group -->
<div class="col-lg-3">
<div class="panel panel-primary <?php if ($surveyIsActive) { echo 'disabled'; } else { echo 'panel-clickable'; } ?>" id="panel-1" data-url="<?php echo $this->createUrl('admin/questions/sa/newquestion/surveyid/'.$surveyid.'/gid/'.$gid); ?>">
<div class="panel-heading">
<h4 class="panel-title"><?php eT("Add new question to group");?></h4>
<div class="panel-title h4"><?php eT("Add new question to group");?></div>
</div>
<div class="panel-body">
<span class="icon-add text-success" style="font-size: 3em;"></span>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/survey/subview/_template_carousel.php
View file
Expand Up @@ -13,7 +13,7 @@
<div class="col-sm-12" id='carrousel-container'>
<div class="row">
<div class="col-sm-12" id="item-container"> <!-- width defined in css -->
<h4 class="panel-title"><?php eT('Select your template:'); ?></h4>
<div class="h4"><?php eT('Select your template:'); ?></div>

<?php foreach($templates as $key=>$template):?>
<?php if (Permission::model()->hasGlobalPermission('superadmin','read') || Permission::model()->hasGlobalPermission('templates','read') || hasTemplateManageRights(Yii::app()->session["loginID"], $key) == 1 || $surveyinfo['template']==htmlspecialchars($key) ): ?>
Expand Down

0 comments on commit 07c899a

Please sign in to comment.