diff options
Diffstat (limited to 'modules-available/minilinux/templates')
5 files changed, 94 insertions, 18 deletions
diff --git a/modules-available/minilinux/templates/branches.html b/modules-available/minilinux/templates/branches.html index d8fb1f68..372321e2 100644 --- a/modules-available/minilinux/templates/branches.html +++ b/modules-available/minilinux/templates/branches.html @@ -1,23 +1,48 @@ <h3>{{lang_branchesHeading}}</h3> +<div class="clearfix"></div> + <div id="ibm-mainframe"> {{#branches}} - <div class="panel panel-default"> + <a id="a-{{bid}}"></a> + <div class="panel panel-default" {{#color}}style="background:linear-gradient(90deg, {{color}} 0%, {{color}} 4px, rgba(255,255,255,0) 4px)"{{/color}}> <div class="panel-heading"> - <div class="pull-right"> - {{sourceid}} {{branchid}} + <div class="pull-right slx-pointer" data-toggle="collapse" data-target="#{{bid}}"> + {{sourceid}} {{branchid}} <b class="caret"></b> </div> <b>{{title}}</b> </div> + <div class="collapse in branch-item" id="{{bid}}"> <div class="panel-body"> {{description}} </div> {{{versionlist}}} + </div> </div> {{/branches}} </div> <script> document.addEventListener('DOMContentLoaded', function () { + // Remember collapsed state + var c = localStorage.getItem('ml-collapse'); + if (c) { + c = JSON.parse(c); + for (var e in c) { + if (c.hasOwnProperty(e)) { + $('#' + e).collapse('hide'); + } + } + } else { + c = {}; + } + $('.branch-item').on('hide.bs.collapse', function() { + c[this.id] = true; + localStorage.setItem('ml-collapse', JSON.stringify(c)); + }).on('show.bs.collapse', function() { + delete c[this.id]; + localStorage.setItem('ml-collapse', JSON.stringify(c)); + }); + // Button magic var addHandlers = function(parent) { parent.find('.btn-verify').click(function() { loadDetails($(this).data('version'), { show: "version", verify: 1 }); diff --git a/modules-available/minilinux/templates/filelist.html b/modules-available/minilinux/templates/filelist.html index 0d8b9901..241d1264 100644 --- a/modules-available/minilinux/templates/filelist.html +++ b/modules-available/minilinux/templates/filelist.html @@ -8,12 +8,6 @@ {{lang_verify}} </button> {{/verify_button}} - {{#download_button}} - <button type="button" class="btn btn-xs btn-success btn-download" data-version="{{versionid}}"> - <span class="glyphicon glyphicon-download"></span> - {{lang_download}} - </button> - {{/download_button}} {{#delete_button}} <button type="submit" name="show" value="delete" class="btn btn-xs btn-danger" data-confirm="{{lang_confirmDeleteVersion}}"> @@ -47,12 +41,18 @@ </tr> {{/files}} </table> +{{#s4_errors}} +<div class="alert alert-warning">{{lang_maybeMissingStage4}}: {{.}}</div> +{{/s4_errors}} {{#dltask}} <div class="hidden" data-tm-id="{{dltask}}" data-tm-callback="dlTmCb"></div> <pre class="collapse" id="error-{{dltask}}"></pre> {{/dltask}} {{#changelog}} -<h4>{{lang_changelog}}</h4> -{{changelog}} + <div class="slx-space"></div> +<div style="border:1px solid #bbb;padding:4px;border-radius: 3px"> + <h4>{{lang_changelog}}</h4> + {{{changelog}}} +</div> {{/changelog}} <div class="slx-space"></div>
\ No newline at end of file diff --git a/modules-available/minilinux/templates/page-minilinux.html b/modules-available/minilinux/templates/page-minilinux.html index 3059e827..c66de597 100644 --- a/modules-available/minilinux/templates/page-minilinux.html +++ b/modules-available/minilinux/templates/page-minilinux.html @@ -1,5 +1,18 @@ -<h1>{{lang_minilinuxHeading}}</h1> +{{#sources}} +<div class="panel panel-default pull-right" style="margin:2px"> + <table class="table table-condensed"> + <tr style="background:#eee"> + <th>{{sourceid}}</th> + </tr> + {{#list}} + <tr {{#color}}style="background:linear-gradient(90deg, {{color}} 0%, {{color}} 4px, rgba(255,255,255,0) 4px)"{{/color}}> + <td><a href="#a-{{bid}}">{{title}}</a></td> + </tr> + {{/list}} + </table> +</div> +{{/sources}} -<p>{{lang_introText}}</p> +<h1>{{lang_minilinuxHeading}}</h1> {{lang_selectedDefaultIs}}: <b>{{default}}</b>
\ No newline at end of file diff --git a/modules-available/minilinux/templates/sources.html b/modules-available/minilinux/templates/sources.html index dabc7f4d..50ad7c6f 100644 --- a/modules-available/minilinux/templates/sources.html +++ b/modules-available/minilinux/templates/sources.html @@ -20,10 +20,10 @@ <td class="small">{{url}}</td> <td class="{{update_class}}">{{lastupdate_s}}</td> <td class="text-center"> - <button type="button" class="btn btn-default btn-xs" data-confirm="#confirm-{{source}}" data-close="{{lang_close}}"> + <button type="button" class="btn btn-default btn-xs" data-confirm="#confirm-{{sourceid}}" data-close="{{lang_close}}"> <span class="glyphicon glyphicon-eye-open"></span> </button> - <pre id="confirm-{{source}}" class="hidden">{{pubkey}}</pre> + <pre id="confirm-{{sourceid}}" class="hidden">{{pubkey}}</pre> </td> </tr> {{/list}} diff --git a/modules-available/minilinux/templates/versionlist.html b/modules-available/minilinux/templates/versionlist.html index 0acfecac..e66960b2 100644 --- a/modules-available/minilinux/templates/versionlist.html +++ b/modules-available/minilinux/templates/versionlist.html @@ -3,6 +3,7 @@ <th class="slx-smallcol">{{lang_version}}</th> <th class="slx-smallcol">{{lang_releaseDate}}</th> <th>{{lang_title}}</th> + <th class="slx-smallcol">{{lang_usedBy}}</th> <th class="slx-smallcol"></th> <th class="slx-smallcol" style="width:100px">{{lang_default}}</th> <th class="slx-smallcol" style="width:150px">{{lang_download}}</th> @@ -15,9 +16,44 @@ <b class="caret"></b> </a> </td> - <td class="text-nowrap">{{dateline_s}}</td> + <td class="text-nowrap"> + {{#desclen}} + <div style="float:right;margin-right:-6px"> + <span class="glyphicon glyphicon-list-alt"></span> + </div> + {{/desclen}} + {{dateline_s}} + </td> <td>{{title}}</td> <td class="text-nowrap"> + {{#usage.entryids.0}} + <div class="dropdown"> + <button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown"> + {{usage.entryCount}} / {{usage.menuCount}} / {{usage.locationCount}} + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li role="separator" class="dropdown-header slx-bold">{{lang_menuEntries}}</li> + {{#usage.entryids}} + <li><a href="?do=serversetup&show=editbootentry&id={{.}}">{{.}}</a></li> + {{/usage.entryids}} + {{#usage.menus.0}} + <li role="separator" class="dropdown-header slx-bold">{{lang_menus}}</li> + {{/usage.menus.0}} + {{#usage.menus}} + <li><a href="?do=serversetup&show=editmenu&id={{menuid}}">{{menuname}}</a></li> + {{/usage.menus}} + {{#usage.locations.0}} + <li role="separator" class="dropdown-header slx-bold">{{lang_locations}}</li> + {{/usage.locations.0}} + {{#usage.locations}} + <li class="disabled"><a href="#">{{locationname}}</a></li> + {{/usage.locations}} + </ul> + </div> + {{/usage.entryids.0}} + </td> + <td class="text-nowrap"> {{#orphan}} <span class="label label-danger" title="{{lang_orphanedVersionToolTip}}">{{lang_orphanedVersion}}</span> {{/orphan}} @@ -36,22 +72,24 @@ <span class="glyphicon glyphicon-ok" title="{{lang_isGlobalDefault}}"></span> {{/isdefault}} </td> - <td class="text-nowrap text-center"> + <td class="text-nowrap text-right"> {{#installed}} <span class="label label-info">{{lang_installed}}</span> {{/installed}} {{^installed}} + {{^orphan}} {{^downloading}} <button type="button" class="btn btn-xs btn-success btn-download" data-version="{{versionid}}"> <span class="glyphicon glyphicon-download"></span> {{lang_download}} </button> {{/downloading}} + {{/orphan}} {{/installed}} </td> </tr> <tr> - <td colspan="6" class="version-container collapse" data-version="{{versionid}}"></td> + <td colspan="7" class="version-container collapse" data-version="{{versionid}}"></td> </tr> {{/versions}} </table>
\ No newline at end of file |