Skip to content

Commit

Permalink
Merge pull request #2084 from gabrieljenik/bug/12349b--RTL-languages-…
Browse files Browse the repository at this point in the history 
…not-dispayed-correctly-in-the-admin-editor

Fixed issue #T546: Fix RTL issues
  • Loading branch information
@glimz
glimz committed Nov 1, 2021
2 parents 6bb4ba6 + 756c9dc commit 5e0218a
Show file tree
Hide file tree
Showing 6 changed files with 209 additions and 191 deletions.
42 changes: 21 additions & 21 deletions application/views/admin/globalsettings/_general.php
View file
Expand Up @@ -20,18 +20,18 @@
<!-- Global sitename -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='sitename'>
<label class="col-sm-12 control-label" for='sitename'>
<?php eT("Site name:"); echo ((Yii::app()->getConfig("demoMode")==true)?'*':''); ?>
</label>
<div class="col-sm-12 text-left">
<div class="col-sm-12">
<input class="form-control" type='text' size='50' id='sitename' name='sitename' value="<?php echo htmlspecialchars(getGlobalSetting('sitename')); ?>" />
</div>
</div>
</div>
<!-- Default Template -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for="defaulttheme">
<label class="col-sm-12 control-label" for="defaulttheme">
<?php eT("Default theme:"); echo ((Yii::app()->getConfig("demoMode")==true)?'*':'');?>
</label>
<div class="col-sm-12">
Expand All @@ -48,7 +48,7 @@
<!-- Autocreate group and question -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for="createsample">
<label class="col-sm-12 control-label" for="createsample">
<?php eT("Create example question group and question:");?>
</label>
<div class="col-sm-12">
Expand All @@ -69,7 +69,7 @@
<!-- Administrative Template -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for="admintheme">
<label class="col-sm-12 control-label" for="admintheme">
<?php eT("Administration theme:"); ?>
</label>
<div class="col-sm-12">
Expand All @@ -92,7 +92,7 @@
</div>
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='timeadjust'>
<label class="col-sm-12 control-label" for='timeadjust'>
<?php eT("Time difference (in hours):"); ?>
</label>
<div class="col-sm-4">
Expand All @@ -111,7 +111,7 @@
<?php if( isset(Yii::app()->session->connectionID) ): ?>
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12" >
<label class="col-sm-12 text-left control-label" for='iSessionExpirationTime'>
<label class="col-sm-12 control-label" for='iSessionExpirationTime'>
<?php eT("Session lifetime for surveys (seconds):"); ?>
</label>
<div class="col-sm-12">
Expand All @@ -122,7 +122,7 @@
<?php endif; ?>
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='ipInfoDbAPIKey'>
<label class="col-sm-12 control-label" for='ipInfoDbAPIKey'>
<?php eT("IP Info DB API Key:"); ?>
</label>
<div class="col-sm-12">
Expand All @@ -132,7 +132,7 @@
</div>
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='googleMapsAPIKey'>
<label class="col-sm-12 control-label" for='googleMapsAPIKey'>
<?php eT("Google Maps API key:"); ?>
</label>
<div class="col-sm-12">
Expand All @@ -143,7 +143,7 @@

<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='googleanalyticsapikey'>
<label class="col-sm-12 control-label" for='googleanalyticsapikey'>
<?php eT("Google Analytics Tracking ID:"); ?>
</label>
<div class="col-sm-12">
Expand All @@ -153,7 +153,7 @@
</div>
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='googletranslateapikey'>
<label class="col-sm-12 control-label" for='googletranslateapikey'>
<?php eT("Google Translate API key:"); ?>
</label>
<div class="col-sm-12">
Expand All @@ -163,7 +163,7 @@
</div>
<div class="row ls-space margin top-10">
<div class='form-group col-xs-12'>
<label class='col-sm-12 text-left control-label' for='characterset'>
<label class='col-sm-12 control-label' for='characterset'>
<?php eT("Character set for file import/export:") ?>
</label>
<div class='col-sm-12'>
Expand All @@ -189,7 +189,7 @@
<!-- Maintenance mode -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for="maintenancemode" title="<?php echo gT('Maintenance modes:
<label class="col-sm-12 control-label" for="maintenancemode" title="<?php echo gT('Maintenance modes:
Off
Soft lock - participants are able to finish started surveys, no new participants are allowed
Full lock - none of participants are allowed to take survey, even if they already started to take it'); ?> ">
Expand All @@ -213,7 +213,7 @@
<!-- Refresh assets -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='refreshassets'>
<label class="col-sm-12 control-label" for='refreshassets'>
<?php eT("Clear assets cache:"); ?> <small>(<?php echo getGlobalSetting('customassetversionnumber');?>)</small>
</label>
<div class="col-sm-12">
Expand All @@ -225,7 +225,7 @@
<!-- Default Editor mode -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='defaulthtmleditormode'>
<label class="col-sm-12 control-label" for='defaulthtmleditormode'>
<?php eT("Default HTML editor mode:"); echo ((Yii::app()->getConfig("demoMode")==true)?'*':''); ?>
</label>
<div class="col-sm-12">
Expand All @@ -247,7 +247,7 @@
<?php /* This setting is just remaining here for campatibility reasons. It is not yet implemented into the new admmin panel */ ?>
<div class="row" style="display:none">
<div class='form-group'>
<label class='col-sm-12 text-left control-label' for='sideMenuBehaviour'>
<label class='col-sm-12 control-label' for='sideMenuBehaviour'>
<?php eT("Side-menu behaviour:"); ?>
</label>
<div class='col-sm-4'>
Expand All @@ -268,7 +268,7 @@
<!-- Default question type selector mode -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='defaultquestionselectormode'>
<label class="col-sm-12 control-label" for='defaultquestionselectormode'>
<?php eT("Question type selector:"); echo((Yii::app()->getConfig("demoMode")==true)?'*':''); ?>
</label>
<div class="col-sm-12">
Expand All @@ -288,7 +288,7 @@
<!-- Default theme editor mode -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='defaultthemeteeditormode'>
<label class="col-sm-12 control-label" for='defaultthemeteeditormode'>
<?php eT("Template editor:"); echo ((Yii::app()->getConfig("demoMode")==true)?'*':''); ?>
</label>
<div class="col-sm-12">
Expand All @@ -308,7 +308,7 @@
<!-- Default theme editor mode -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='javascriptdebugbcknd'>
<label class="col-sm-12 control-label" for='javascriptdebugbcknd'>
<?php eT("JS-Debug mode [Backend]:"); echo ((Yii::app()->getConfig("demoMode")==true)?'*':''); ?>
</label>
<div class="col-sm-12">
Expand All @@ -326,7 +326,7 @@
<!-- Default theme editor mode -->
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='javascriptdebugfrntnd'>
<label class="col-sm-12 control-label" for='javascriptdebugfrntnd'>
<?php eT("JS-Debug mode [Frontend]:"); echo ((Yii::app()->getConfig("demoMode")==true)?'*':''); ?>
</label>
<div class="col-sm-12">
Expand All @@ -346,7 +346,7 @@
<?php if(Permission::model()->hasGlobalPermission('superadmin','read')):?>
<div class="row ls-space margin top-10">
<div class="form-group col-xs-12">
<label class="col-sm-12 text-left control-label" for='allow_unstable_extension_update'>
<label class="col-sm-12 control-label" for='allow_unstable_extension_update'>
<?php eT('Allow unstable extension updates:'); ?>
</label>
<div class="col-sm-12">
Expand Down
174 changes: 90 additions & 84 deletions assets/packages/adminbasics/build/adminbasics.css
View file
Expand Up @@ -4183,6 +4183,12 @@ table.dataTable thead .sorting_desc:after {
padding-right: 0;
}

/* Fix text alignment on RTL */
html[dir="rtl"] .dropdown-menu,
html[dir="rtl"] th {
text-align: initial;
}

.jcarousel-wrapper {
margin: 20px auto;
position: relative;
Expand Down Expand Up @@ -4407,90 +4413,6 @@ div.mappable-attribute-wrapper.paired.ui-state-disabled {
min-height: 100px;
}

#cpdbatt {
min-height: 100px;
}

#selectable .ui-selecting {
background: #8CCE00;
}

#selectable .ui-selected {
background: #C1DD7F;
color: #000000;
}

#selectable {
list-style-type: none;
margin: 2px;
padding: 0;
width: 90%;
}

#selectable li {
padding: 1em;
font-size: 1em;
height: 9px;
text-align: center;
margin: 4px;
}

.ui-icon.exporticon {
background-image: url("images/export.gif");
}

#feedback {
font-size: 1.4em;
}

#selectableadd .ui-selecting {
background: #0066CC;
}

#selectableadd .ui-selected {
background: #0066CC;
color: white;
}

#selectableadd {
list-style-type: none;
margin: 0;
padding: 0;
width: 90%;
text-align: center;
}

#selectableadd li {
margin: 3px;
padding: 0.4em;
font-size: 1 em;
height: 18px;
text-align: center;
}

.popupgroup {
border: 1px solid #DAE5F4;
padding: 10px;
border-radius: 3px;
margin: 8px;
}

#responses-column-filter-modal .checkbox label {
vertical-align: text-bottom;
white-space: nowrap;
overflow-x: hidden;
}

.responses-multiselect-checkboxes {
overflow-y: scroll;
height: 60vh;
}

.responses-column-filter-modal-checkbox-buttons {
text-align: left;
padding-bottom: 15px;
}

.grid-view .table td.button-column, .grid-view .table th.button-column, .grid-view-ls .table td.button-column, .grid-view-ls .table th.button-column {
white-space: nowrap;
text-align: initial;
Expand Down Expand Up @@ -4630,3 +4552,87 @@ div.mappable-attribute-wrapper.paired.ui-state-disabled {
border: none;
display: inline-block;
}

#selectable .ui-selecting {
background: #8CCE00;
}

#selectable .ui-selected {
background: #C1DD7F;
color: #000000;
}

#selectable {
list-style-type: none;
margin: 2px;
padding: 0;
width: 90%;
}

#selectable li {
padding: 1em;
font-size: 1em;
height: 9px;
text-align: center;
margin: 4px;
}

.ui-icon.exporticon {
background-image: url("images/export.gif");
}

#feedback {
font-size: 1.4em;
}

#selectableadd .ui-selecting {
background: #0066CC;
}

#selectableadd .ui-selected {
background: #0066CC;
color: white;
}

#selectableadd {
list-style-type: none;
margin: 0;
padding: 0;
width: 90%;
text-align: center;
}

#selectableadd li {
margin: 3px;
padding: 0.4em;
font-size: 1 em;
height: 18px;
text-align: center;
}

.popupgroup {
border: 1px solid #DAE5F4;
padding: 10px;
border-radius: 3px;
margin: 8px;
}

#responses-column-filter-modal .checkbox label {
vertical-align: text-bottom;
white-space: nowrap;
overflow-x: hidden;
}

.responses-multiselect-checkboxes {
overflow-y: scroll;
height: 60vh;
}

.responses-column-filter-modal-checkbox-buttons {
text-align: left;
padding-bottom: 15px;
}

#cpdbatt {
min-height: 100px;
}
2 changes: 1 addition & 1 deletion assets/packages/adminbasics/build/adminbasics.min.css
View file

Large diffs are not rendered by default.

0 comments on commit 5e0218a

Please sign in to comment.