atlas_assets 0.4.5 → 0.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. data/Gemfile.lock +1 -1
  2. data/docs/_layouts/default.html +1 -0
  3. data/docs/_plugins/jekyll_assets.rb +0 -1
  4. data/docs/_posts/2013-10-28-dropdown.md +51 -5
  5. data/lib/assets/javascripts/collections/dropdown_collection.coffee +2 -2
  6. data/lib/assets/javascripts/models/dropdown.coffee +2 -1
  7. data/lib/assets/javascripts/templates/dropdown.hbs +6 -2
  8. data/lib/assets/javascripts/views/dropdown_view.coffee +1 -1
  9. data/lib/assets/stylesheets/atlas_assets/_chosen.scss +2 -1
  10. data/lib/assets/stylesheets/atlas_assets/dropdown.scss +18 -2
  11. data/lib/atlas_assets/version.rb +1 -1
  12. metadata +2 -4
  13. data/docs/ignore/atlas_assets/dropdown.css +0 -24
  14. data/docs/ignore/atlas_assets.css +0 -9582
data/Gemfile.lock CHANGED
@@ -9,7 +9,7 @@ GIT
9
9
  PATH
10
10
  remote: .
11
11
  specs:
12
- atlas_assets (0.4.5)
12
+ atlas_assets (0.4.6)
13
13
  handlebars_assets (~> 0.12.2)
14
14
 
15
15
  GEM
data/docs/_layouts/default.html CHANGED
@@ -5,6 +5,7 @@
5
5
  <title>{{ page.title }}</title>
6
6
  {% stylesheet atlas_assets %}
7
7
  {% javascript atlas_assets %}
8
+ <script>JST = HandlebarsTemplates</script>
8
9
  <style type="text/css">
9
10
  body {
10
11
  padding: 60px 0px;
data/docs/_plugins/jekyll_assets.rb CHANGED
@@ -1,4 +1,3 @@
1
1
  require 'handlebars_assets'
2
- HandlebarsAssets::Config.template_namespace = 'JST'
3
2
  Sprockets.append_path HandlebarsAssets.path
4
3
  require "jekyll-assets"
data/docs/_posts/2013-10-28-dropdown.md CHANGED
@@ -9,7 +9,13 @@ Dropdowns
9
9
 
10
10
  The Dropdown is a site wide BackboneView helper using the [Chosen](http://harvesthq.github.io/chosen/) Javascript library.
11
11
 
12
- <div id="dropdown-examples"></div>
12
+ <div style="float:left;"><a href="#" class="btn">Build Settings</a></div>
13
+ <div style="float:left;" id="dropdown-example-1"></div>
14
+
15
+ <div style="clear:both;"></div>
16
+
17
+ <div id="dropdown-example-2"></div>
18
+ <div id="dropdown-example-3"></div>
13
19
 
14
20
  <script>
15
21
  $(function () {
@@ -19,15 +25,35 @@ $(function () {
19
25
  dropdown.add({model: new classes.Dropdown({'label':'second'})})
20
26
  dropdown.add({model: new classes.Dropdown({'label':'third'})})
21
27
 
22
- $('#dropdown-examples').append(dropdown.render().el)
28
+ $('#dropdown-example-1').append(dropdown.render().el)
23
29
 
30
+ // Set the label from a different atribute, and choose a default value
24
31
  window.dropdown2 = new classes.DropdownView({'label':'title', 'default_to':'third'});
25
32
 
26
33
  dropdown2.add({model: new classes.Dropdown({'title':'first'})})
27
34
  dropdown2.add({model: new classes.Dropdown({'title':'second'})})
28
35
  dropdown2.add({model: new classes.Dropdown({'title':'third'})})
29
36
 
30
- $('#dropdown-examples').append(dropdown2.render().el)
37
+ $('#dropdown-example-2').append(dropdown2.render().el)
38
+
39
+ // Add helper texts
40
+ dropdown3 = new classes.DropdownView({'helper': 'option1'})
41
+
42
+ dropdown3.add({model: new classes.Dropdown({'label': 'this'})})
43
+ dropdown3.add({model: new classes.Dropdown({'label': 'that'})})
44
+
45
+ $('#dropdown-example-3').append(dropdown3.render().el)
46
+
47
+ // Helper Text and Multiple Selection
48
+ dropdown4 = new classes.DropdownView({'helper':'option2', 'multiple':true})
49
+ dropdown4.add({model: new classes.Dropdown({'label': 'the other'})})
50
+ dropdown4.add({model: new classes.Dropdown({'label': 'that other'})})
51
+ dropdown4.add({model: new classes.Dropdown({'label': '1'})})
52
+ dropdown4.add({model: new classes.Dropdown({'label': '2'})})
53
+ dropdown4.add({model: new classes.Dropdown({'label': '3'})})
54
+ dropdown4.add({model: new classes.Dropdown({'label': '4'})})
55
+ dropdown4.add({model: new classes.Dropdown({'label': '5'})})
56
+ $('#dropdown-example-3').append(dropdown4.render().el)
31
57
  })
32
58
  </script>
33
59
 
@@ -38,13 +64,33 @@ $(function () {
38
64
  dropdown.add({model: new classes.Dropdown({'label':'second'})})
39
65
  dropdown.add({model: new classes.Dropdown({'label':'third'})})
40
66
 
41
- $('#dropdown-examples').append(dropdown.render().el)
67
+ $('#dropdown-example-1').append(dropdown.render().el)
42
68
 
69
+ // Set the label from a different atribute, and choose a default value
43
70
  window.dropdown2 = new classes.DropdownView({'label':'title', 'default_to':'third'});
44
71
 
45
72
  dropdown2.add({model: new classes.Dropdown({'title':'first'})})
46
73
  dropdown2.add({model: new classes.Dropdown({'title':'second'})})
47
74
  dropdown2.add({model: new classes.Dropdown({'title':'third'})})
48
75
 
49
- $('#dropdown-examples').append(dropdown2.render().el)
76
+ $('#dropdown-example-2').append(dropdown2.render().el)
77
+
78
+ // Add helper texts
79
+ dropdown3 = new classes.DropdownView({'helper': 'option1'})
80
+
81
+ dropdown3.add({model: new classes.Dropdown({'label': 'this'})})
82
+ dropdown3.add({model: new classes.Dropdown({'label': 'that'})})
83
+
84
+ $('#dropdown-example-3').append(dropdown3.render().el)
85
+
86
+ // Helper Text and Multiple Selection
87
+ dropdown4 = new classes.DropdownView({'helper':'option2', 'multiple':true})
88
+ dropdown4.add({model: new classes.Dropdown({'label': 'the other'})})
89
+ dropdown4.add({model: new classes.Dropdown({'label': 'that other'})})
90
+ dropdown4.add({model: new classes.Dropdown({'label': '1'})})
91
+ dropdown4.add({model: new classes.Dropdown({'label': '2'})})
92
+ dropdown4.add({model: new classes.Dropdown({'label': '3'})})
93
+ dropdown4.add({model: new classes.Dropdown({'label': '4'})})
94
+ dropdown4.add({model: new classes.Dropdown({'label': '5'})})
95
+ $('#dropdown-example-3').append(dropdown4.render().el)
50
96
  ~~~
data/lib/assets/javascripts/collections/dropdown_collection.coffee CHANGED
@@ -1,2 +1,2 @@
1
- classes.DropDownCollection = Backbone.Collection.extend
2
- model: classes.DropDown
1
+ classes.DropdownCollection = Backbone.Collection.extend
2
+ model: classes.Dropdown
data/lib/assets/javascripts/models/dropdown.coffee CHANGED
@@ -1,5 +1,6 @@
1
- classes.DropDown = Backbone.Model.extend
1
+ classes.Dropdown = Backbone.Model.extend
2
2
  intialize: () ->
3
3
  @
4
+
4
5
  setLabel: (label) ->
5
6
  @set('label',@get(label))
data/lib/assets/javascripts/templates/dropdown.hbs CHANGED
@@ -1,8 +1,12 @@
1
1
  {{#if helper}}
2
2
  <span class="helper">{{helper}}</span>
3
+ <div class="dropdown-with-helper-container">
3
4
  {{/if}}
4
- <select class="dropdown-list" {{#if placeholder}}data-placeholder='{{placeholder}}'{{/if}}>
5
+ <select class="dropdown-list" {{#if multiple}}multiple{{/if}} {{#if placeholder}}data-placeholder='{{placeholder}}'{{/if}}>
5
6
  {{#each models}}
6
7
  <option {{#if selected}}selected{{/if}} {{#if disabled}}disabled{{/if}}>{{label}}</option>
7
8
  {{/each}}
8
- </select>
9
+ </select>
10
+ {{#if helper}}
11
+ </div>
12
+ {{/if}}
data/lib/assets/javascripts/views/dropdown_view.coffee CHANGED
@@ -5,7 +5,7 @@ classes.DropdownView = Backbone.View.extend
5
5
 
6
6
  initialize: (opts) ->
7
7
  if !@collection?
8
- @collection = new classes.DropDownCollection
8
+ @collection = new classes.DropdownCollection
9
9
  @opts = _.extend({width: "100%", disable_search_threshold: 2}, opts)
10
10
  @template = JST["dropdown"];
11
11
  @listenTo(@collection, 'add', @render)
data/lib/assets/stylesheets/atlas_assets/_chosen.scss CHANGED
@@ -42,7 +42,8 @@
42
42
  display: block;
43
43
  overflow: hidden;
44
44
  padding: 0 0 0 8px;
45
- height: 23px;
45
+ padding: 4px 12px;
46
+ height: 20px;
46
47
  border: 1px solid $defaultBorderColor;
47
48
  background-color: $defaultBackgroundColor;
48
49
  background-clip: padding-box;
data/lib/assets/stylesheets/atlas_assets/dropdown.scss CHANGED
@@ -2,13 +2,29 @@
2
2
 
3
3
  .dropdown {
4
4
  display: inline-block;
5
- padding: 10px 0;
5
+ padding: 0 0 10px;
6
6
  position: relative;
7
- font-size: 14px;
7
+ font-size: 13px;
8
8
 
9
9
  .helper {
10
10
  color: $medium_gray;
11
11
  }
12
+
13
+ .dropdown-with-helper-container {
14
+ display: inline-block;
15
+ }
16
+
17
+ .chosen-container {
18
+ .chosen-single,
19
+ .chosen-choices {
20
+ @include border-radius($defaultBorderRadius);
21
+ }
22
+ }
23
+
24
+ .chosen-container-multi .chosen-results,
25
+ .chosen-container-multi .chosen-drop, {
26
+ @include border-radius($defaultBorderRadius);
27
+ }
12
28
  }
13
29
 
14
30
  .dropdown[class*="span"] {
data/lib/atlas_assets/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Atlas
2
2
  module Assets
3
- VERSION = "0.4.5"
3
+ VERSION = "0.4.6"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: atlas_assets
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.5
4
+ version: 0.4.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-10-29 00:00:00.000000000 Z
12
+ date: 2013-10-30 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: handlebars_assets
@@ -63,8 +63,6 @@ files:
63
63
  - docs/_posts/2013-09-12-logo.md
64
64
  - docs/_posts/2013-10-28-dropdown.md
65
65
  - docs/glyphicons-license.txt
66
- - docs/ignore/atlas_assets.css
67
- - docs/ignore/atlas_assets/dropdown.css
68
66
  - docs/index.html
69
67
  - lib/assets/fonts/fontawesome-webfont.eot
70
68
  - lib/assets/fonts/fontawesome-webfont.svg
data/docs/ignore/atlas_assets/dropdown.css DELETED
@@ -1,24 +0,0 @@
1
- /* Colors
2
- ------------------------------------------------------- */
3
- /* Fonts
4
- ------------------------------------------------------- */
5
- /* Defaults
6
- ------------------------------------------------------- */
7
- /* Forms
8
- ------------------------------------------------------- */
9
- /* Z-Indexes
10
- ------------------------------------------------------- */
11
- /* Grid
12
- ------------------------------------------------------- */
13
- /* Fluid grid
14
- ------------------------------------------------------- */
15
- .dropdown {
16
- display: inline-block;
17
- padding: 10px 0;
18
- position: relative;
19
- font-size: 14px; }
20
- .dropdown .helper {
21
- color: gray; }
22
-
23
- .dropdown[class*="span"] {
24
- margin-left: 0; }