Restructure the update list

This commit is contained in:
Samuel Georges 2015-06-30 20:03:27 +10:00
parent adada0b4a5
commit 52e7376b24
3 changed files with 127 additions and 88 deletions

View File

@ -2,49 +2,60 @@
border: 1px solid #ccc;
margin-bottom: 20px;
}
.control-updatelist h5 {
.control-updatelist .update-item {
border-bottom: 1px solid #ccc;
}
.control-updatelist .update-item .item-header {
background-color: #f5f5f5;
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
padding: 15px 10px;
}
.control-updatelist .update-item .item-header h5 {
margin: 0;
padding: 0;
text-transform: uppercase;
font-size: 13px;
}
.control-updatelist h5:first-of-type {
border-top: none;
}
.control-updatelist h5 i {
.control-updatelist .update-item .item-header h5 i {
margin-right: 7px;
color: #405261;
}
.control-updatelist h5 small {
.control-updatelist .update-item .item-header h5 small {
text-transform: none;
float: right;
line-height: 13px;
margin-right: 5px;
}
.control-updatelist dl {
.control-updatelist .update-item dl {
padding: 10px;
margin-bottom: 0;
font-size: 12px;
}
.control-updatelist dl:before,
.control-updatelist dl:after {
.control-updatelist .update-item dl:before,
.control-updatelist .update-item dl:after {
content: " ";
display: table;
}
.control-updatelist dl:after {
.control-updatelist .update-item dl:after {
clear: both;
}
.control-updatelist dl dt,
.control-updatelist dl dd {
.control-updatelist .update-item dl dt,
.control-updatelist .update-item dl dd {
float: left;
padding: 5px 0;
}
.control-updatelist dl dt {
.control-updatelist .update-item dl dt {
width: 15%;
}
.control-updatelist dl dd {
.control-updatelist .update-item dl dd {
width: 85%;
}
.control-updatelist .update-item:last-child {
border-bottom: none;
}
.control-updatelist .update-item.item-danger .item-header {
background-color: #f2dede;
}
.control-updatelist .update-item.item-danger dl {
color: #a94442;
}

View File

@ -5,47 +5,64 @@
border: 1px solid #ccc;
margin-bottom: @line-height-computed;
h5 {
background-color: @color-list-accent;
border-top: 1px solid #ccc;
.update-item {
border-bottom: 1px solid #ccc;
padding: 15px 10px;
margin: 0;
text-transform: uppercase;
font-size: 13px;
&:first-of-type {
border-top: none;
.item-header {
background-color: #f5f5f5;
border-bottom: 1px solid #ccc;
padding: 15px 10px;
h5 {
margin: 0;
padding: 0;
text-transform: uppercase;
font-size: 13px;
i {
margin-right: 7px;
color: @color-text-title;
}
small {
text-transform: none;
float: right;
line-height: 13px;
margin-right: 5px;
}
}
}
i {
margin-right: 7px;
color: @color-text-title;
dl {
padding: 10px;
margin-bottom: 0;
font-size: 12px;
.clearfix;
dt, dd {
float: left;
padding: 5px 0;
}
dt {
width: 15%;
}
dd {
width: 85%;
}
}
small {
text-transform: none;
float: right;
line-height: 13px;
margin-right: 5px;
&:last-child {
border-bottom: none;
}
}
dl {
padding: 10px;
margin-bottom: 0;
font-size: 12px;
.clearfix;
dt, dd {
float: left;
padding: 5px 0;
}
dt {
width: 15%;
}
dd {
width: 85%;
&.item-danger {
.item-header {
background-color: @state-danger-bg;
}
dl {
color: @state-danger-text;
}
}
}

View File

@ -10,56 +10,67 @@
<div class="control-updatelist">
<div class="control-scrollbar" style="height:300px" data-control="scrollbar">
<?php if ($core): ?>
<h5>
<i class="icon-cube"></i>
<?= e(trans('system::lang.system.name')) ?>
<?php if ($core['old_build']): ?>
<small><?= e(trans('system::lang.updates.core_build_old', ['build'=>$core['old_build']])) ?></small>
<?php endif ?>
</h5>
<dl>
<dt><?= e(trans('system::lang.updates.core_build_new', ['build'=>$core['build']])) ?></dt>
<dd><?= e(trans('system::lang.updates.core_build_new_help')) ?></dd>
</dl>
<input type="hidden" name="hash" value="<?= e($core['hash']) ?>" />
<input type="hidden" name="build" value="<?= e($core['build']) ?>" />
<div class="update-item">
<div class="item-header">
<h5>
<i class="icon-cube"></i>
<?= e(trans('system::lang.system.name')) ?>
<?php if ($core['old_build']): ?>
<small><?= e(trans('system::lang.updates.core_build_old', ['build'=>$core['old_build']])) ?></small>
<?php endif ?>
</h5>
</div>
<dl>
<dt><?= e(trans('system::lang.updates.core_build_new', ['build'=>$core['build']])) ?></dt>
<dd><?= e(trans('system::lang.updates.core_build_new_help')) ?></dd>
</dl>
<input type="hidden" name="hash" value="<?= e($core['hash']) ?>" />
<input type="hidden" name="build" value="<?= e($core['build']) ?>" />
</div>
<?php endif ?>
<?php foreach ($themeList as $code => $theme): ?>
<h5>
<i class="icon-picture-o"></i>
<?= e(array_get($theme, 'name', 'Unknown')) ?>
<small><?= e(trans('system::lang.updates.theme_label')) ?></small>
</h5>
<dl>
<dt><?= e(array_get($theme, 'version', 'v1.0.0')) ?></dt>
<dd><?= e(trans('system::lang.updates.theme_new_install')) ?></dd>
</dl>
<div class="update-item">
<div class="item-header">
<h5>
<i class="icon-picture-o"></i>
<?= e(array_get($theme, 'name', 'Unknown')) ?>
<small><?= e(trans('system::lang.updates.theme_label')) ?></small>
</h5>
</div>
<dl>
<dt><?= e(array_get($theme, 'version', 'v1.0.0')) ?></dt>
<dd><?= e(trans('system::lang.updates.theme_new_install')) ?></dd>
</dl>
<input type="hidden" name="themes[<?= e($code) ?>]" value="<?= e($theme['hash']) ?>" />
<input type="hidden" name="themes[<?= e($code) ?>]" value="<?= e($theme['hash']) ?>" />
</div>
<?php endforeach ?>
<?php foreach ($pluginList as $code => $plugin): ?>
<h5>
<i class="<?= e($plugin['icon'] ?: 'icon-puzzle-piece') ?>"></i>
<?= e($plugin['name']) ?>
<div class="update-item">
<div class="item-header">
<h5>
<i class="<?= e($plugin['icon'] ?: 'icon-puzzle-piece') ?>"></i>
<?= e($plugin['name']) ?>
<?php if ($plugin['old_version']): ?>
<small><?= e(trans('system::lang.updates.plugin_version_old', ['version'=>$plugin['old_version']])) ?></small>
<?php else: ?>
<small><?= e(trans('system::lang.updates.plugin_version_none')) ?></small>
<?php endif ?>
</h5>
<dl>
<?php foreach ($plugin['updates'] as $version => $description): ?>
<dt><?= e(trans('system::lang.updates.plugin_version_new', compact('version'))) ?></dt>
<dd><?= e($description) ?></dd>
<?php endforeach ?>
</dl>
<?php if ($plugin['old_version']): ?>
<small><?= e(trans('system::lang.updates.plugin_version_old', ['version'=>$plugin['old_version']])) ?></small>
<?php else: ?>
<small><?= e(trans('system::lang.updates.plugin_version_none')) ?></small>
<?php endif ?>
</h5>
</div>
<dl>
<?php foreach ($plugin['updates'] as $version => $description): ?>
<dt><?= e(trans('system::lang.updates.plugin_version_new', compact('version'))) ?></dt>
<dd><?= e($description) ?></dd>
<?php endforeach ?>
</dl>
<input type="hidden" name="plugins[<?= e($code) ?>]" value="<?= e($plugin['hash']) ?>" />
<input type="hidden" name="plugins[<?= e($code) ?>]" value="<?= e($plugin['hash']) ?>" />
</div>
<?php endforeach ?>
</div>