app mgmt app level design enhancements

This commit is contained in:
Jan-Christoph Borchardt 2015-04-07 11:55:10 +02:00
parent 25531bad88
commit 6250365bf4
4 changed files with 39 additions and 36 deletions

View file

@ -670,7 +670,7 @@ label.infield {
}
.warning-input {
border-color: #cc3333 !important;
border-color: #ce3702 !important;
}
/* Fixes for log in page, TODO should be removed some time */

View file

@ -194,38 +194,42 @@ input.userFilter {width: 200px;}
background: #fbb;
}
.recommendedapp {
font-size: 11px;
background-position: left center;
padding-left: 18px;
vertical-align: top;
span.version {
margin-left: 1em;
margin-right: 1em;
color: #555;
}
span.version { margin-left:1em; margin-right:1em; color:#555; }
#app-navigation .app-external,
.app-version,
.recommendedapp {
.app-version {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
filter: alpha(opacity=50);
opacity: .5;
}
.app-level {
color: white;
margin-top: 8px;
}
.app-level .official, .app-level .approved {
background-color: #E8C805;
border-radius: 2px;
margin-left: 5px;
padding: 3px;
.app-level span {
color: #555;
background-color: transparent;
border: 1px solid #555;
border-radius: 3px;
padding: 3px 6px;
}
.app-level .official {
border-color: #37ce02;
background-position: left center;
background-position: 5px center;
padding-left: 25px;
}
.app-level .approved {
border-color: #e8c805;
}
.app-level .experimental {
background-color: #F02405;
border-radius: 2px;
margin-left: 5px;
padding: 3px;
background-color: #ce3702;
border-color: #ce3702;
color: #fff;
}
#apps-list {
@ -235,6 +239,9 @@ span.version { margin-left:1em; margin-right:1em; color:#555; }
.section {
position: relative;
}
.section h2.app-name {
margin-bottom: 8px;
}
.app-image {
float: left;
padding-right: 10px;
@ -254,8 +261,7 @@ span.version { margin-left:1em; margin-right:1em; color:#555; }
.app-name,
.app-version,
.app-score,
.app-level,
.recommendedapp {
.app-level {
display: inline-block;
}
@ -286,7 +292,7 @@ span.version { margin-left:1em; margin-right:1em; color:#555; }
.app-dependencies {
margin-top: 10px;
color: #c33;
color: #ce3702;
}
.missing-dependencies {
@ -321,7 +327,7 @@ table.grid td.date{
#security-warning li {
list-style: initial;
margin: 10px 0;
color: #c33;
color: #ce3702;
}
#shareAPI p { padding-bottom: 0.8em; }
#shareAPI input#shareapiExpireAfterNDays {width: 25px;}
@ -372,12 +378,12 @@ table.grid td.date{
}
span.success {
background: #37ce02;
border-radius: 3px;
background: #37ce02;
border-radius: 3px;
}
span.error {
background: #ce3702;
background: #ce3702;
}

View file

@ -12,7 +12,7 @@ Handlebars.registerHelper('score', function() {
Handlebars.registerHelper('level', function() {
if(typeof this.level !== 'undefined') {
if(this.level === 200) {
return new Handlebars.SafeString('<span class="official">Official</span>');
return new Handlebars.SafeString('<span class="official icon-checkmark">Official</span>');
} else if(this.level === 100) {
return new Handlebars.SafeString('<span class="approved">Approved</span>');
} else {

View file

@ -59,9 +59,6 @@ script(
{{/if}}
<h2 class="app-name"><a href="{{detailpage}}" target="_blank">{{name}}</a></h2>
<div class="app-version"> {{version}}</div>
<div class="app-level">
{{{level}}}
</div>
{{#if profilepage}}<a href="{{profilepage}}" target="_blank" rel="noreferrer">{{/if}}
<div class="app-author"><?php p($l->t('by')); ?> {{author}}
{{#if licence}}
@ -72,9 +69,9 @@ script(
{{#if score}}
<div class="app-score">{{{score}}}</div>
{{/if}}
{{#if internalclass}}
<div class="{{internalclass}} icon-checkmark">{{internallabel}}</div>
{{/if}}
<div class="app-level">
{{{level}}}
</div>
<div class="app-detailpage"></div>
<div class="app-description-container hidden">
@ -141,7 +138,7 @@ script(
<button class="settings-button" data-apps-slide-toggle="#app-settings-content"></button>
</div>
<div id="app-settings-content" style="color: #c33">
<div id="app-settings-content" style="color: #ce3702">
<input type="checkbox" id="enable-experimental-apps" <?php if($_['experimentalEnabled']) { print_unescaped('checked="checked"'); }?>>
<label for="enable-experimental-apps"><?php p($l->t('Enable experimental apps')) ?></label>
<p>