Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@olleharstedt
olleharstedt committed Sep 20, 2021
2 parents fa7ddc5 + d3398c8 commit b02e7f6
Show file tree
Hide file tree
Showing 53 changed files with 1,653 additions and 2,273 deletions.
2 changes: 1 addition & 1 deletion application/config/version.php
View file
Expand Up @@ -16,5 +16,5 @@
$config['buildnumber'] = '';
$config['updatable'] = true;
$config['templateapiversion'] = 3;
$config['assetsversionnumber'] = '30235';
$config['assetsversionnumber'] = '30237';
return $config;
3 changes: 2 additions & 1 deletion application/core/plugins/TwoFactorAdminLogin/views/index.php
View file
Expand Up @@ -38,6 +38,7 @@
'columns' => $model->colums,
'filter' => $model,
'afterAjaxUpdate' => 'window.TFA.bind',
'htmlOptions' => ['class' => 'table-responsive grid-view-ls'],
'summaryText' => "<div class='row'>"
."<div class='col-xs-6'></div>"
."<div class='col-xs-6'>"
Expand Down Expand Up @@ -66,4 +67,4 @@
</div>
<?php endif; ?>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion application/extensions/admin/survey/ListSurveysWidget/views/listSurveys.php
View file
Expand Up @@ -29,7 +29,7 @@
$this->pageSize,
Yii::app()->params['pageSizeOptions'],
array('class'=>'changePageSize form-control', 'style'=>'display: inline; width: auto'))),
'htmlOptions' => ['class' => 'table-responsive'],
'htmlOptions' => ['class' => 'table-responsive grid-view-ls'],
'selectionChanged'=>"function(id){window.location='" . Yii::app()->urlManager->createUrl('surveyAdministration/view/iSurveyID' ) . '/' . "' + $.fn.yiiGridView.getSelection(id.split(',', 1));}",
'ajaxUpdate' => 'survey-grid',
'afterAjaxUpdate' => 'function(id, data){window.LS.doToolTip();bindListItemclick();}',
Expand Down
2 changes: 1 addition & 1 deletion application/models/User.php
View file
Expand Up @@ -786,7 +786,7 @@ public function getManagementColums()
'filter' => false,
'htmlOptions' => [
// "style" => "white-space: pre;",
"class" => "col-md-2 col-xs-1 text-center button-column"
"class" => "text-center button-column"
]
),
array(
Expand Down
14 changes: 7 additions & 7 deletions application/views/admin/labels/labelsets_view.php
View file
Expand Up @@ -20,10 +20,13 @@
'dataProvider' => $model->search(),

// Number of row per page selection
'id' => 'labelsets-grid',
'emptyText' => gT('No label sets found.'),
'template' => "{items}\n<div id='labelsetsListPager'><div class=\"col-sm-4\" id=\"massive-action-container\"></div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
'summaryText' => gT('Displaying {start}-{end} of {count} result(s).').' '. sprintf(gT('%s rows per page'),
'id' => 'labelsets-grid',
'emptyText' => gT('No label sets found.'),
'template' => "{items}\n<div id='labelsetsListPager'><div class=\"col-sm-4\" id=\"massive-action-container\"></div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
'htmlOptions' => ['class' => 'table-responsive grid-view-ls'],
'selectionChanged' => "function(id){window.location='" . Yii::app()->urlManager->createUrl('admin/labels/sa/view/lid') . '/' . "' + $.fn.yiiGridView.getSelection(id.split(',', 1));}",
'ajaxUpdate' => 'labelsets-grid',
'summaryText' => gT('Displaying {start}-{end} of {count} result(s).') . ' ' . sprintf(gT('%s rows per page'),
CHtml::dropDownList(
'pageSize',
$pageSize,
Expand Down Expand Up @@ -63,9 +66,6 @@

),

'htmlOptions' => ['class' => 'table-responsive'],
'selectionChanged' => "function(id){window.location='" . Yii::app()->urlManager->createUrl('admin/labels/sa/view/lid') . '/' . "' + $.fn.yiiGridView.getSelection(id.split(',', 1));}",
'ajaxUpdate' => 'labelsets-grid',
));
?>
</div>
Expand Down
10 changes: 5 additions & 5 deletions application/views/admin/notification/index.php
View file
Expand Up @@ -6,11 +6,11 @@

$surveyGrid = $this->widget('bootstrap.widgets.TbGridView', array(
'dataProvider' => $model->search(),
'id' => 'notification-grid',
'emptyText' => gT('No notifications found'),
'itemsCssClass' =>'table-striped',
'ajaxUpdate' => 'notification-grid',
'columns' => array(
'id' => 'notification-grid',
'emptyText' => gT('No notifications found'),
'htmlOptions' => ['class' => 'table-responsive grid-view-ls'],
'ajaxUpdate' => 'notification-grid',
'columns' => array(
/*
array(
'id' => 'id'
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/participants/attributeControl_view.php
View file
Expand Up @@ -25,7 +25,7 @@
'filter' => $model,
'emptyText' => gT('No attributes found.'),
'rowHtmlOptionsExpression' => '["data-attribute_id" => $data->attribute_id]',
'htmlOptions' => ['class' => 'table-responsive'],
'htmlOptions' => ['class' => 'table-responsive grid-view-ls'],
'afterAjaxUpdate' => 'LS.CPDB.bindButtons',
'template' => "{items}\n<div id='tokenListPager'><div class=\"col-sm-4\" id=\"massive-action-container\">$massiveAction</div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
'summaryText' => gT('Displaying {start}-{end} of {count} result(s).') . ' ' . sprintf(
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/participants/displayParticipants_view.php
View file
Expand Up @@ -72,7 +72,7 @@
'dataProvider' => $model->search(),
'columns' => $model->columns,
'rowHtmlOptionsExpression' => '["data-participant_id" => $data->id]',
'htmlOptions' => ['class' => 'table-responsive'],
'htmlOptions' => ['class' => 'table-responsive grid-view-ls'],
'filter' => $model,
'afterAjaxUpdate' => 'function(id, data){LS.CPDB.bindButtons;LS.CPDB.participantPanel();bindListItemclick();}',
'ajaxType' => 'POST',
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/participants/modal_subviews/_showParticipantSurveys.php
View file
Expand Up @@ -21,7 +21,7 @@
'id' => 'list_participant_surveys',
'dataProvider' => $surveymodel->search(),
'columns' => $surveymodel->columns,
'htmlOptions' => array('class'=> 'table-responsive'),
'htmlOptions' => ['class' => 'table-responsive grid-view-ls'],
'afterAjaxUpdate' => 'bindButtonsInsideSurveys',
'ajaxType' => 'POST',
'summaryText' => gT('Displaying {count} survey(s).'),
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/participants/sharePanel_view.php
View file
Expand Up @@ -21,7 +21,7 @@
[
'id' => 'share_central_participants',
'emptyText' => gT('No shared participants found'),
'htmlOptions' => ['class' => 'table-responsive'],
'htmlOptions' => ['class' => 'table-responsive grid-view-ls'],
'dataProvider' => $model->search(),
'rowHtmlOptionsExpression' => '["data-participant_id" => $data->participant_id, "data-share_uid" => $data->share_uid]',
'columns' => $model->columns,
Expand Down
212 changes: 104 additions & 108 deletions application/views/admin/pluginmanager/index.php
View file
Expand Up @@ -14,12 +14,10 @@
$pageSize = intval(Yii::app()->user->getState('pageSize', Yii::app()->params['defaultPageSize']));

?>

<div class='col-sm-12'>
<div> <!-- Extra funny div -->
<div class='col-sm-12'>
<div class='pull-right'>
<?php /* Disabled for prototype 1.
<div class='container-fluid'>
<div class='row'>
<div class='pull-right'>
<?php /* Disabled for prototype 1.
<a
href=''
class='btn btn-default '
Expand All @@ -30,116 +28,114 @@ class='btn btn-default '
<?php eT('Browse the shop'); ?>
</a>
*/ ?>
<?php foreach ($extraMenus as $menu): ?>
<a
href='<?php echo $menu->getHref(); ?>'
<?php if ($menu->getOnClick()): ?>
onclick='<?php echo $menu->getOnClick(); ?>'
<?php endif; ?>
<?php if ($menu->getTooltip()): ?>
data-toggle='tooltip'
data-title='<?php echo $menu->getTooltip(); ?>'
<?php endif; ?>
class='btn btn-default'
>
<?php if ($menu->getIconClass()): ?>
<i class='<?php echo $menu->getIconClass(); ?>'></i>&nbsp;
<?php endif; ?>
<?php echo $menu->getLabel(); ?>
</a>
<?php endforeach; ?>

&nbsp;
</div>
<?php foreach ($extraMenus as $menu): ?>
<a
href='<?php echo $menu->getHref(); ?>'
<?php if ($menu->getOnClick()): ?>
onclick='<?php echo $menu->getOnClick(); ?>'
<?php endif; ?>
<?php if ($menu->getTooltip()): ?>
data-toggle='tooltip'
data-title='<?php echo $menu->getTooltip(); ?>'
<?php endif; ?>
class='btn btn-default'
>
<?php if ($menu->getIconClass()): ?>
<i class='<?php echo $menu->getIconClass(); ?>'></i>&nbsp;
<?php endif; ?>
<?php echo $menu->getLabel(); ?>
</a>
<?php endforeach; ?>
</div>
</div>

<?php
<?php

$sort = new CSort();
$sort->attributes = [
'name' => [
'asc' => 'name',
'desc' => 'name desc',
],
'description' => [
'asc' => 'description',
'desc' => 'description desc',
],
'status' => [
'asc' => 'active',
'desc' => 'active desc',
'default' => 'desc',
],
];
$sort->defaultOrder = [
'name' => CSort::SORT_ASC,
];
$sort = new CSort();
$sort->attributes = [
'name' => [
'asc' => 'name',
'desc' => 'name desc',
],
'description' => [
'asc' => 'description',
'desc' => 'description desc',
],
'status' => [
'asc' => 'active',
'desc' => 'active desc',
'default' => 'desc',
],
];
$sort->defaultOrder = [
'name' => CSort::SORT_ASC,
];

$providerOptions = [
'pagination' => [
'pageSize' => $pageSize,
],
'sort' => $sort,
'caseSensitiveSort' => false,
];
$providerOptions = [
'pagination' => [
'pageSize' => $pageSize,
],
'sort' => $sort,
'caseSensitiveSort' => false,
];

$dataProvider = new CArrayDataProvider($plugins, $providerOptions);
$dataProvider = new CArrayDataProvider($plugins, $providerOptions);

$gridColumns = [
[
'type' => 'raw',
'header' => gT('Action'),
'name' => 'action',
'value' => '$data->getActionButtons()'
],
[
'header' => gT('Status'),
'type' => 'html',
'name' => 'status',
'value' => '$data->getStatus()'
],
[
'header' => gT('Plugin'),
'name' => 'name',
'type' => 'html',
'value' => '$data->getName()'
],
[
'header' => gT('Description'),
'name' => 'description',
'type' => 'html',
'value' => '$data->getDescription()'
],
];
$gridColumns = [
[
'type' => 'raw',
'header' => gT('Action'),
'name' => 'action',
'value' => '$data->getActionButtons()'
],
[
'header' => gT('Status'),
'type' => 'html',
'name' => 'status',
'value' => '$data->getStatus()'
],
[
'header' => gT('Plugin'),
'name' => 'name',
'type' => 'html',
'value' => '$data->getName()'
],
[
'header' => gT('Description'),
'name' => 'description',
'type' => 'html',
'value' => '$data->getDescription()'
],
];

$this->widget(
'bootstrap.widgets.TbGridView',
[
'id' => 'plugins-grid',
'dataProvider' => $dataProvider,
'template' => "{items}\n<div id='pluginsListPager'><div class=\"col-sm-4\" id=\"massive-action-container\"></div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
'summaryText' => gT('Displaying {start}-{end} of {count} result(s).') . ' '
. sprintf(
gT('%s rows per page'),
CHtml::dropDownList(
'pageSize',
$pageSize,
Yii::app()->params['pageSizeOptions'],
[
'class' => 'changePageSize form-control',
'style' => 'display: inline; width: auto'
]
)
),
'columns' => $gridColumns,
'rowHtmlOptionsExpression' => 'array("data-id" => $data["id"])',
'ajaxUpdate' => 'plugins-grid'
]
);
$this->widget(
'bootstrap.widgets.TbGridView',
[
'id' => 'plugins-grid',
'dataProvider' => $dataProvider,
'htmlOptions' => ['class' => 'table-responsive grid-view-ls'],
'template' => "{items}\n<div id='pluginsListPager'><div class=\"col-sm-4\" id=\"massive-action-container\"></div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
'summaryText' => gT('Displaying {start}-{end} of {count} result(s).') . ' '
. sprintf(
gT('%s rows per page'),
CHtml::dropDownList(
'pageSize',
$pageSize,
Yii::app()->params['pageSizeOptions'],
[
'class' => 'changePageSize form-control',
'style' => 'display: inline; width: auto'
]
)
),
'columns' => $gridColumns,
'rowHtmlOptionsExpression' => 'array("data-id" => $data["id"])',
'ajaxUpdate' => 'plugins-grid'
]
);

$this->renderPartial('./pluginmanager/uploadModal', []);
?>
</div>
$this->renderPartial('./pluginmanager/uploadModal', []);
?>
</div>

<script type="text/javascript">
Expand Down
5 changes: 3 additions & 2 deletions application/views/admin/quotas/viewquotas_view.php
View file
Expand Up @@ -38,6 +38,9 @@
<?php $this->widget('bootstrap.widgets.TbGridView', array(
'dataProvider' => $oDataProvider,
'id' => 'quota-grid',
'htmlOptions' => ['class' => 'table-responsive grid-view-ls'],
'itemsCssClass' => 'table-quotas table-striped table-condensed',
'ajaxUpdate' => 'quota-grid',
'emptyText' => gT('No quotas'),
'summaryText' => gT('Displaying {start}-{end} of {count} result(s).') . ' ' . sprintf(gT('%s rows per page'),
CHtml::dropDownList(
Expand Down Expand Up @@ -115,8 +118,6 @@
),

),
'itemsCssClass' => 'table-quotas table-striped table-condensed',
'ajaxUpdate' => 'quota-grid',
));
?>
</div>
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/responses/browsetimerow_view.php
View file
Expand Up @@ -35,7 +35,7 @@
'dataProvider' => $model->search($iSurveyID, $language),
'id' => 'time-grid',
'emptyText'=>gT('No surveys found.'),
'htmlOptions' => ['class' => 'table-responsive time-statistics-table'],
'htmlOptions' => ['class' => 'table-responsive grid-view-ls time-statistics-table'],
'ajaxUpdate' => 'time-grid',
'afterAjaxUpdate' => 'window.LS.doToolTip',
'template' => "{items}\n<div id='timeListPager'><div class=\"col-sm-4\" id=\"massive-action-container\"></div><div class=\"col-sm-4 pager-container ls-ba \">{pager}</div><div class=\"col-sm-4 summary-container\">{summary}</div></div>",
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/responses/listResponses_view.php
View file
Expand Up @@ -222,7 +222,7 @@
'dataProvider' => $model->search(),
'filter' => $model,
'columns' => $aColumns,
'htmlOptions' => ['class' => 'table-responsive'],
'htmlOptions' => ['class' => 'grid-view-ls'],
'id' => 'responses-grid',
'ajaxUpdate' => 'responses-grid',
'ajaxType' => 'POST',
Expand Down

0 comments on commit b02e7f6

Please sign in to comment.