Bootstrap 3

New: Updated UI
New: Mobile browser support
Fixed: /favicon.ico will return the favicon now
This commit is contained in:
Mark McDowall
2014-05-04 00:11:43 -07:00
parent 28fa264c69
commit 99f2b07a11
148 changed files with 2691 additions and 2054 deletions
@@ -1,10 +1,6 @@
<div class="add-thingy col-md-3">
<div class="row">
<div class="col-md-3">
{{implementation}}
{{#if link}}
<a href="{{link}}"><i class="icon-info-sign"/></a>
{{/if}}
</div>
</div>
<div class="add-thingy">
{{implementation}}
{{#if link}}
<a href="{{link}}"><i class="icon-info-sign"/></a>
{{/if}}
</div>
+14 -10
View File
@@ -1,12 +1,16 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Add Notification</h3>
</div>
<div class="modal-body">
<div class="add-notifications add-thingies">
<ul class="items"></ul>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Add Notification</h3>
</div>
<div class="modal-body">
<div class="add-notifications add-thingies">
<ul class="items"></ul>
</div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal">close</button>
</div>
</div>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal">close</button>
</div>
@@ -1,7 +1,7 @@
'use strict';
define([
'marionette',
'Settings/Notifications/ItemView',
'Settings/Notifications/NotificationsItemView',
'Settings/Notifications/SchemaModal'
], function (Marionette, NotificationItemView, SchemaModal) {
return Marionette.CompositeView.extend({
@@ -1,11 +1,15 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Delete Notification</h3>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Delete Notification</h3>
</div>
<div class="modal-body">
<p>Are you sure you want to delete '{{name}}'?</p>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal">cancel</button>
<button class="btn btn-danger x-confirm-delete">delete</button>
</div>
</div>
</div>
<div class="modal-body">
<p>Are you sure you want to delete '{{name}}'?</p>
</div>
<div class="modal-footer">
<button class="btn" data-dismiss="modal">cancel</button>
<button class="btn btn-danger x-confirm-delete">delete</button>
</div>
@@ -1,23 +0,0 @@
<div class="notification-item thingy">
<div>
<h3>{{name}}</h3>
<span class="btn-group pull-right">
<button class="btn btn-xs btn-icon-only x-edit"><i class="icon-nd-edit"/></button>
<button class="btn btn-xs btn-icon-only x-delete"><i class="icon-nd-delete"/></button>
</span>
</div>
<div class="settings">
{{#if onGrab}}
<span class="label label-success">On Grab</span>
{{else}}
<span class="label">On Grab</span>
{{/if}}
{{#if onDownload}}
<span class="label label-success">On Download</span>
{{else}}
<span class="label">On Download</span>
{{/if}}
</div>
</div>
@@ -67,8 +67,9 @@ define(
_cancel: function () {
if (this.model.isNew()) {
this.model.destroy();
vent.trigger(vent.Commands.CloseModalCommand);
}
vent.trigger(vent.Commands.CloseModalCommand);
},
_deleteNotification: function () {
@@ -1,103 +1,113 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
{{#if id}}
<h3>Edit - {{implementation}}</h3>
{{else}}
<h3>Add - {{implementation}}</h3>
{{/if}}
</div>
<div class="modal-body">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label">Name</label>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close x-cancel" aria-hidden="true">&times;</button>
{{#if id}}
<h3>Edit - {{implementation}}</h3>
{{else}}
<h3>Add - {{implementation}}</h3>
{{/if}}
</div>
<div class="modal-body">
<div class="form-horizontal">
<div class="form-group">
<label class="col-sm-3 control-label">Name</label>
<div class="controls">
<input type="text" name="name"/>
<div class="col-sm-5">
<input type="text" name="name" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">On Grab</label>
<div class="col-sm-5">
<div class="input-group">
<label class="checkbox toggle well">
<input type="checkbox" name="onGrab"/>
<p>
<span>Yes</span>
<span>No</span>
</p>
<div class="btn btn-primary slide-button"/>
</label>
<span class="help-inline-checkbox">
<i class="icon-nd-form-info" title="Do you want to get notifications when episodes are grabbed?"/>
</span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">On Download</label>
<div class="col-sm-5">
<div class="input-group">
<label class="checkbox toggle well">
<input type="checkbox" name="onDownload" class="x-on-download"/>
<p>
<span>Yes</span>
<span>No</span>
</p>
<div class="btn btn-primary slide-button"/>
</label>
<span class="help-inline-checkbox">
<i class="icon-nd-form-info" title="Do you want to get notifications when episodes are downloaded?"/>
</span>
</div>
</div>
</div>
<div class="form-group x-on-upgrade">
<label class="col-sm-3 control-label">On Upgrade</label>
<div class="col-sm-5">
<div class="input-group">
<label class="checkbox toggle well">
<input type="checkbox" name="onUpgrade"/>
<p>
<span>Yes</span>
<span>No</span>
</p>
<div class="btn btn-primary slide-button"/>
</label>
<span class="help-inline-checkbox">
<i class="icon-nd-form-info" title="Do you want to get notifications when episodes are upgraded to a better quality?"/>
</span>
</div>
</div>
</div>
{{formBuilder}}
</div>
</div>
<div class="modal-footer">
{{#if id}}
<button class="btn btn-danger pull-left x-delete">delete</button>
{{else}}
<button class="btn pull-left x-back">back</button>
{{/if}}
<div class="form-group">
<label class="control-label">On Grab</label>
<button class="btn x-test">test <i class="x-test-icon icon-nd-test"/></button>
<button class="btn x-cancel">cancel</button>
<div class="controls">
<label class="checkbox toggle well">
<input type="checkbox" name="onGrab"/>
<p>
<span>Yes</span>
<span>No</span>
</p>
<div class="btn btn-primary slide-button"/>
</label>
<span class="help-inline-checkbox">
<i class="icon-nd-form-info" title="Do you want to get notifications when episodes are grabbed?"/>
</span>
<div class="btn-group">
<button class="btn btn-primary x-save">save</button>
<button class="btn btn-icon-only btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li class="save-and-add x-save-and-add">
save and add
</li>
</ul>
</div>
</div>
<div class="form-group">
<label class="control-label">On Download</label>
<div class="controls">
<label class="checkbox toggle well">
<input type="checkbox" name="onDownload" class="x-on-download"/>
<p>
<span>Yes</span>
<span>No</span>
</p>
<div class="btn btn-primary slide-button"/>
</label>
<span class="help-inline-checkbox">
<i class="icon-nd-form-info" title="Do you want to get notifications when episodes are downloaded?"/>
</span>
</div>
</div>
<div class="form-group x-on-upgrade">
<label class="control-label">On Upgrade</label>
<div class="controls">
<label class="checkbox toggle well">
<input type="checkbox" name="onUpgrade"/>
<p>
<span>Yes</span>
<span>No</span>
</p>
<div class="btn btn-primary slide-button"/>
</label>
<span class="help-inline-checkbox">
<i class="icon-nd-form-info" title="Do you want to get notifications when episodes are upgraded to a better quality?"/>
</span>
</div>
</div>
{{formBuilder}}
</div>
</div>
<div class="modal-footer">
{{#if id}}
<button class="btn btn-danger pull-left x-delete">delete</button>
{{else}}
<button class="btn pull-left x-back">back</button>
{{/if}}
<button class="btn x-test">test <i class="x-test-icon icon-nd-test"/></button>
<button class="btn x-cancel">cancel</button>
<div class="btn-group">
<button class="btn btn-primary x-save">save</button>
<button class="btn btn-icon-only btn-primary dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li class="save-and-add x-save-and-add">
save and add
</li>
</ul>
</div>
</div>
@@ -0,0 +1,19 @@
<div class="notification-item thingy" title="Click to edit">
<div>
<h3>{{name}}</h3>
</div>
<div class="settings">
{{#if onGrab}}
<span class="label label-success">On Grab</span>
{{else}}
<span class="label label-default">On Grab</span>
{{/if}}
{{#if onDownload}}
<span class="label label-success">On Download</span>
{{else}}
<span class="label label-default">On Download</span>
{{/if}}
</div>
</div>
@@ -3,18 +3,16 @@
define([
'AppLayout',
'marionette',
'Settings/Notifications/NotificationEditView',
'Settings/Notifications/DeleteView'
'Settings/Notifications/NotificationEditView'
], function (AppLayout, Marionette, EditView, DeleteView) {
], function (AppLayout, Marionette, EditView) {
return Marionette.ItemView.extend({
template: 'Settings/Notifications/ItemTemplate',
template: 'Settings/Notifications/NotificationItemViewTemplate',
tagName : 'li',
events: {
'click .x-edit' : '_editNotification',
'click .x-delete': '_deleteNotification'
'click' : '_editNotification'
},
initialize: function () {
@@ -24,11 +22,6 @@ define([
_editNotification: function () {
var view = new EditView({ model: this.model, notificationCollection: this.model.collection});
AppLayout.modalRegion.show(view);
},
_deleteNotification: function () {
var view = new DeleteView({ model: this.model});
AppLayout.modalRegion.show(view);
}
});
});
@@ -1,26 +1,31 @@
.notifications {
width: -webkit-fit-content;
width: -moz-fit-content;
width: fit-content;
}
@import "../../Shared/Styles/clickable.less";
//.notifications {
// width: -webkit-fit-content;
// width: -moz-fit-content;
// width: fit-content;
//}
.notification-item {
.clickable;
width: 290px;
height: 90px;
padding: 20px 20px;
h3 {
width: 230px;
}
.settings {
margin-top: 5px;
}
&.add-card {
.center {
margin-top: 15px;
margin-top: -4px;
}
}
}
.add-notifications {
li {
width: 40%;
}
}