Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2159 from kzantow/JENKINS-33246-show-install-depe…
…ndency-legend

[FIX JENKINS-33246] Add a footnote about ** in setup wizard
  • Loading branch information
daniel-beck committed Mar 22, 2016
2 parents 5a9ac39 + 0263180 commit 547f304
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 7 deletions.
Expand Up @@ -48,3 +48,4 @@ installWizard_configureProxy_label=Configure Proxy
installWizard_configureProxy_save=Save and Continue
installWizard_skipPluginInstallations=Skip Plugin Installations
installWizard_installIncomplete_dependenciesLabel=Dependencies
installWizard_installingConsole_dependencyIndicatorNote=** - required dependency
2 changes: 1 addition & 1 deletion war/src/main/js/pluginSetupWizardGui.js
Expand Up @@ -415,7 +415,7 @@ var createPluginSetupWizard = function(appendTarget) {
}
}

$c = $('.install-console');
$c = $('.install-console-scroll');
if($c.is(':visible')) {
$c.scrollTop($c[0].scrollHeight);
}
Expand Down
7 changes: 6 additions & 1 deletion war/src/main/js/templates/progressPanel.hbs
Expand Up @@ -17,5 +17,10 @@
{{/each}}
</div>

<div class="install-console"><div class="install-text"></div></div>
<div class="install-console">
<div class="install-console-scroll">
<div class="install-text"></div>
</div>
<div class="dependency-legend">{{translations.installWizard_installingConsole_dependencyIndicatorNote}}</div>
</div>
</div>
30 changes: 25 additions & 5 deletions war/src/main/less/pluginSetupWizard.less
Expand Up @@ -521,9 +521,17 @@
z-index: 5;
top: 33.3%;
width: 25%;
padding: 6px 0;
overflow:auto;


.install-console-scroll {
position: absolute;
top: 6px;
right: 0;
bottom: 2em;
left: 0;
overflow:auto;
font: 12px monospace;
}

@media screen and (max-width: 992px) {
width: 100%;
position:static;
Expand All @@ -543,13 +551,25 @@
}

.dependent {
color: #aaa;
padding-left: .4em;
color: #777;
padding-left: 10px;

&:before {
content: ' ** ';
}
}

.dependency-legend {
color: #777;
position: absolute;
bottom: 0;
left: 0;
right: 0;
border-top: 1px solid #ccc;
background: #f8f8f8;
padding: 4px 10px;
font: 12px monospace;
}
}

.selected-plugin-progress {
Expand Down

0 comments on commit 547f304

Please sign in to comment.