Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use stacked nav on left to navigate site settings categories

This commit is contained in:
Neil Lalonde 2013-11-15 15:22:42 -05:00
parent dfdc618e9a
commit 97bc187735
6 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/admin/templates/site_settings.js.handlebars
View File

@ -10,12 +10,21 @@
</div> </div>
</div> </div>
<ul class="nav nav-pills site-settings-nav"> <div class="site-settings-nav pull-left">
<ul class="nav nav-stacked">
{{#each category in controller}} {{#each category in controller}}
<li {{bindAttr class="category.nameKey"}}>{{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}{{category.name}}{{/link-to}}</li> <li {{bindAttr class="category.nameKey"}}>
{{#link-to 'adminSiteSettingsCategory' category.nameKey class=category.nameKey}}
{{category.name}}
<span class='icon-chevron-right'></span>
{{/link-to}}
</li>
{{/each}} {{/each}}
</ul> </ul>
</div>
<hr/> <div class="site-settings-detail pull-left">
{{ outlet }} {{ outlet }}
</div>
<div class="clearfix"></div>

4
app/assets/javascripts/admin/templates/site_settings/setting_bool.js.handlebars
View File

@ -1,7 +1,7 @@
<div class='span4 offset1'> <div class='setting-label'>
<h3>{{unbound setting}}</h3> <h3>{{unbound setting}}</h3>
</div> </div>
<div class="span11"> <div class="setting-value">
<label> <label>
{{view Ember.Checkbox checkedBinding="enabled" value="true"}} {{view Ember.Checkbox checkedBinding="enabled" value="true"}}
{{unbound description}} {{unbound description}}

6
app/assets/javascripts/admin/templates/site_settings/setting_enum.js.handlebars
View File

@ -1,12 +1,12 @@
<div class='span4 offset1'> <div class='setting-label'>
<h3>{{unbound setting}}</h3> <h3>{{unbound setting}}</h3>
</div> </div>
<div class="span11"> <div class="setting-value">
{{combobox valueAttribute="value" content=validValues value=value none=allowsNone}} {{combobox valueAttribute="value" content=validValues value=value none=allowsNone}}
<div class='desc'>{{unbound description}}</div> <div class='desc'>{{unbound description}}</div>
</div> </div>
{{#if dirty}} {{#if dirty}}
<div class='span3'> <div class='setting-controls'>
<button class='btn ok' {{action save this}}><i class='icon-ok'></i></button> <button class='btn ok' {{action save this}}><i class='icon-ok'></i></button>
<button class='btn cancel' {{action cancel this}}><i class='icon-remove'></i></button> <button class='btn cancel' {{action cancel this}}><i class='icon-remove'></i></button>
</div> </div>

8
app/assets/javascripts/admin/templates/site_settings/setting_string.js.handlebars
View File

@ -1,12 +1,12 @@
<div class='span4 offset1'> <div class='setting-label'>
<h3>{{unbound setting}}</h3> <h3>{{unbound setting}}</h3>
</div> </div>
<div class="span11"> <div class="setting-value">
{{textField value=value classNames="input-xxlarge"}} {{textField value=value classNames="input-setting-string"}}
<div class='desc'>{{unbound description}}</div> <div class='desc'>{{unbound description}}</div>
</div> </div>
{{#if dirty}} {{#if dirty}}
<div class='span3'> <div class='setting-controls'>
<button class='btn ok' {{action save this}}><i class='icon-ok'></i></button> <button class='btn ok' {{action save this}}><i class='icon-ok'></i></button>
<button class='btn cancel' {{action cancel this}}><i class='icon-remove'></i></button> <button class='btn cancel' {{action cancel this}}><i class='icon-remove'></i></button>
</div> </div>

3
app/assets/javascripts/admin/templates/site_settings_category.js.handlebars
View File

@ -1 +1,4 @@
<h2>{{name}}</h2>
<hr/>
{{collection contentBinding="filteredContent" classNames="form-horizontal settings" itemViewClass="Discourse.SiteSettingView"}} {{collection contentBinding="filteredContent" classNames="form-horizontal settings" itemViewClass="Discourse.SiteSettingView"}}

41
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -144,26 +144,37 @@ td {border-bottom: 1px solid #ddd; border-top: 1px solid #ddd;}
} }
.site-settings-nav { .site-settings-nav {
li { width: 200px;
background-color: grayscale($nav-pills-background-color-hover); margin-top: 33px;
margin-bottom: 5px; li a.active {
color: $white;
&.required, &.basic { background-color: $nav-stacked-background-color-active;
margin-bottom: 20px; // so nothing floats underneath these ones }
} }
> a { .site-settings-detail {
font-size: 13px; width: 850px;
&.required, &.basic { margin-left: 30px;
font-size: 16px;
}
}
}
} }
.settings { .settings {
.setting { .setting {
padding-bottom: 20px; padding-bottom: 20px;
.setting-label {
float: left;
width: 196px;
margin-right: 12px;
}
.setting-value {
float: left;
width: 450px;
}
.setting-controls {
float: left;
width: 144px;
}
.desc { .desc {
padding-top: 3px; padding-top: 3px;
color: darken($white, 40%); color: darken($white, 40%);
@ -184,6 +195,10 @@ td {border-bottom: 1px solid #ddd; border-top: 1px solid #ddd;}
color: darken($yellow, 20%); color: darken($yellow, 20%);
} }
} }
.input-setting-string {
width: 404px;
}
} }
section.details { section.details {