Skip to content

Commit

Permalink
Revert "New feature #14156:easily disable no more table for specific …
Browse files Browse the repository at this point in the history
…questions (#1152)"

This reverts commit c569dca.
Dev: included template need update … reopen merge request after
  • Loading branch information
Shnoulle committed Nov 2, 2018
1 parent c569dca commit 284896e
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 244 deletions.
4 changes: 2 additions & 2 deletions application/config/version.php
Expand Up @@ -13,8 +13,8 @@


$config['versionnumber'] = '3.15.1';
$config['dbversionnumber'] = 356;
$config['dbversionnumber'] = 355;
$config['buildnumber'] = '';
$config['updatable'] = true;
$config['assetsversionnumber'] = '30064';
$config['assetsversionnumber'] = '30063';
return $config;
8 changes: 0 additions & 8 deletions application/core/LsDefaultDataSets.php
Expand Up @@ -925,12 +925,4 @@ public static function getTutorialEntryData()

return $returnArray;
}

public static function getPluginActivated()
{
$returnArray = [];
$returnArray[] = ['id' => 1, 'name' => 'Authdb', 'active' => 1, 'version' => null];
$returnArray[] = ['id' => 2, 'name' => 'tableClassQuestionAttribute', 'active' => 1, 'version' => null];
return $returnArray;
}
}

This file was deleted.

This file was deleted.

This file was deleted.

27 changes: 0 additions & 27 deletions application/helpers/update/updatedb_helper.php
Expand Up @@ -2337,15 +2337,6 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
$oDB->createCommand()->update('{{settings_global}}', ['stg_value'=>355], "stg_name='DBVersion'");
}

if ($iOldDBVersion < 356) {
$oTransaction = $oDB->beginTransaction();
if(activatePlugin('tableClassQuestionAttribute'))
{
$oTransaction->commit();
$oDB->createCommand()->update('{{settings_global}}', ['stg_value'=>356], "stg_name='DBVersion'");
}
}


} catch (Exception $e) {
Yii::app()->setConfig('Updating', false);
Expand Down Expand Up @@ -2417,24 +2408,6 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
Yii::app()->setConfig('Updating', false);
return true;
}

/**
* Activate a plugin by name
* Currently don't send plugin activate event
* @param CDbConnection $oDB
* @param string $plugin name
* @return boolean
*/
function activatePlugin($plugin)
{
$oPlugin = Plugin::model()->findByAttributes(array('name'=>$plugin));
if (!$oPlugin) {
$oPlugin = new Plugin();
$oPlugin->name = $plugin;
}
$oPlugin->active = 1;
return $oPlugin->save();
}
/**
* @param CDbConnection $oDB
*
Expand Down
67 changes: 67 additions & 0 deletions assets/packages/template-core/template-core.css
Expand Up @@ -116,3 +116,70 @@ table.ls-answers input[type="checkbox"],table.ls-answers input[type="radio"]{mar
.dir-rtl .radio-item label.ls-label-xs-visibility > * ,.dir-rtl .checkbox-item label.ls-label-xs-visibility > * {left:-10000px;}
/* hide answers for text-display question */
.boilerplate .answer-container {display:none;}

/*
Max width before this PARTICULAR table gets nasty
For iPads specifically : add this : (min-device-width: 768px) and (max-device-width: 1024px)
*/
@media
only screen and (max-width: 760px),
(min-device-width: 768px) and (max-device-width: 1024px) {
table.ls-answers,table.ls-answers thead,table.ls-answers tbody,table.ls-answers th,table.ls-answers td,table.ls-answers tr {display: block;}
.dir-ltr table.ls-answers,.dir-ltr table.ls-answers thead,.dir-ltr table.ls-answers tbody,.dir-ltr table.ls-answers th,.dir-ltr table.ls-answers td,table.ls-answers tr {text-align:left;}
.dir-rtl table.ls-answers,.dir-rtl table.ls-answers thead,.dir-rtl table.ls-answers tbody,.dir-rtl table.ls-answers th,.dir-rtl table.ls-answers td,table.ls-answers tr {text-align:right;}

table.ls-answers thead{display:none} /* We don't need it for accessibility : we already have the label */

table.ls-answers tbody td{text-align:left;}
table.ls-answers .information-item:empty{display:none}
.dir-rtl table.ls-answers tbody td{text-align:right;}
.ls-answers td.radio-item,.ls-answers td.checkbox-item{padding: 4px;}
.dir-ltr .ls-answers td.radio-item,.dir-ltr .ls-answers td.checkbox-item{padding-left: 24px;padding-right: 4px;}
.dir-rtl .ls-answers td.radio-item,.dir-rtl .ls-answers td.checkbox-item{padding-right: 24px;padding-left: 4px;}

table.ls-answers tbody .control-label{text-align:left}
.dir-rtl table.ls-answers tbody .control-label{text-align:right}
table.ls-answers .answertextright{text-align:right}
.dir-rtl table.ls-answers .answertextright{text-align:left}

/* Show the label */
table.ls-answers .ls-label-xs-visibility
{
display:block;
position:relative;
width: auto;
height: auto;
overflow:initial;
}
.dir-ltr table.ls-answers .ls-label-xs-visibility{left:auto;}
.dir-rtl table.ls-answers .ls-label-xs-visibility{right:auto;}

table.ls-answers .radio-item .ls-label-xs-visibility,table.ls-answers .checkbox-item .ls-label-xs-visibility{
line-height: initial;
text-indent: initial;
}
.dir-ltr table.ls-answers .radio-item .ls-label-xs-visibility,.dir-ltr table.ls-answers .checkbox-item .ls-label-xs-visibility{margin-left:0;}
.dir-rtl table.ls-answers .radio-item .ls-label-xs-visibility,.dir-rtl table.ls-answers .checkbox-item .ls-label-xs-visibility{margin-right:0;}

table.ls-answers .ls-label-xs-visibility > *
{
position:relative;
top:auto;
width:auto;
height:auto;
overflow:auto;
}
.dir-ltr table.ls-answers .ls-label-xs-visibility > * {left:auto;}
.dir-rtl table.ls-answers .ls-label-xs-visibility > * {right:auto;}

.dir-ltr table.ls-answers .radio-item label.ls-label-xs-visibility::before,.dir-ltr table.ls-answers .checkbox-item label.ls-label-xs-visibility::before {margin-left:-20px;}
.dir-rtl table.ls-answers .radio-item label.ls-label-xs-visibility::before,.dir-rtl table.ls-answers .checkbox-item label.ls-label-xs-visibility::before {margin-right:-20px;}
.dir-ltr table.ls-answers .radio-item label.ls-label-xs-visibility::after,.dir-ltr table.ls-answers .checkbox-item label.ls-label-xs-visibility::after {margin-left:-20px;}
.dir-rtl table.ls-answers .radio-item label.ls-label-xs-visibility::after,.dir-rtl table.ls-answers .checkbox-item label.ls-label-xs-visibility::after {margin-right:-20px;}

table.ls-answers > tbody > tr:hover {
background-color: transparent;
}
/* bs fix */
table.ls-answers td.visible-xs,table.ls-answers th.visible-xs{display:block !important}
}
3 changes: 0 additions & 3 deletions installer/create-database.php
Expand Up @@ -278,9 +278,6 @@ function createDatabase($oDB){
'version' => "string(32) NULL",
));

foreach( $pluginsActivated=LsDefaultDataSets::getPluginActivated() as $plugins){
$oDB->createCommand()->insert("{{plugins}}", $plugins);
}

// plugin_settings
$oDB->createCommand()->createTable('{{plugin_settings}}', array(
Expand Down

0 comments on commit 284896e

Please sign in to comment.