tkh_admin_panel 0.9.18 → 0.9.19

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 52c08d9689da015f0a2b7cbd9c004019d80ca9f7
4
- data.tar.gz: 02a7f119c6f18c440f2a2d3e48a803affc4c014a
3
+ metadata.gz: cde3f7d229674c6aec233794b0a8da0c8d46be98
4
+ data.tar.gz: 3ef0b08e61bed8c0c4dcf9ef72121d4643b36b07
5
5
  SHA512:
6
- metadata.gz: 0b0316a7e4db2c215d29c52a54e831b0748bd40696943b2ebc6291c9f7a05959a5149a3ce4b308c1d295eeab46c1db5972c2aeea0d616357248d827f5b1c1ace
7
- data.tar.gz: 73b1b705fcb7a448ffa0534fb9892848680e9312a18a195ca44c1b76c18aedab40c340629290e5b66ab0d4f175ed6484ba101c618d7e3c01c3f463c4f6de469c
6
+ metadata.gz: 1d4e624ec61fd10de25ca1da952097ed4304b515e24635258426eec51c9bf77b8d3dd1dc013d1dbb21afeab0f6a0c7d1ad48f4d0869de9c21af12280489a89fd
7
+ data.tar.gz: 1c04a75583ecadae6078f3263b6313b34df421b68ba9168567c196204b88027c402df9b19800d2b7ac418ffe5aac29637766b2dec4e15e299dcde35a90dd20e3
data/CHANGELOG.md CHANGED
@@ -2,6 +2,14 @@
2
2
 
3
3
 
4
4
 
5
+ ## 0.9.19
6
+
7
+ * Added the javascript for sanskrit course lessons autocomplete.
8
+ * The flash messages are now rendered from the partial in the tkh_toolbox gem.
9
+ * Added an inline-form class in admin custom.css.
10
+ * Blog link in admin panel doesn't show if blog is disabled in site settings.
11
+
12
+
5
13
  ## 0.9.18
6
14
 
7
15
  * Upgraded Rails and simple_form dependencies.
@@ -0,0 +1,8 @@
1
+ jQuery ->
2
+ # Used in the sanskrit application for autocomplete of lesson names in courses
3
+
4
+ # Typeahead form field for autocomplete associations
5
+ $('#course_lesson_name').typeahead(
6
+ # items: 10,
7
+ name: 'course_lesson_name',
8
+ local: $('#course_lesson_name').data('source') )
@@ -152,6 +152,8 @@ margin: 0;
152
152
  text-align: center;
153
153
  }
154
154
 
155
+ .inline-form { display: inline; }
156
+
155
157
  // boostrap 3 and simple_form don't play too well together yet
156
158
  .alert-error {
157
159
  @extend .alert-danger;
@@ -22,7 +22,7 @@
22
22
  <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
23
23
  <ul class="nav navbar-nav">
24
24
  <%= content_tag :li, link_to(Setting.first.try(:site_name), root_path) %>
25
- <%= content_tag :li, link_to( 'blog', blog_path) %>
25
+ <%= content_tag :li, link_to( 'blog', blog_path) unless Setting.first.disable_blog? %>
26
26
  </ul>
27
27
  <ul class="nav navbar-nav navbar-right navbar-login-info">
28
28
  <li class="dropdown">
@@ -46,12 +46,7 @@
46
46
 
47
47
  <div class="row">
48
48
  <div class="col-xs-12 col-sm-9 col-lg-10">
49
- <% flash.each do |name, msg| %>
50
- <div class="alert alert-<%= name == :notice ? "success" : "danger" %>">
51
- <a class="close" data-dismiss="alert">×</a>
52
- <%= msg %>
53
- </div>
54
- <% end %>
49
+ <%= render 'shared/flash_messages' %>
55
50
  <%= yield %>
56
51
  </div>
57
52
 
@@ -77,12 +72,15 @@
77
72
  <%= javascript_include_tag "admin" %>
78
73
 
79
74
  <% # the twitter typeahead javascript library needs all typeahead form fields to be present in DOM. this is an ugly hack %>
75
+ <% # FIXME - refactor this mess %>
80
76
  <% if controller.controller_name == 'pages' %>
81
77
  <%= javascript_include_tag 'admin/pages' %>
82
78
  <% elsif controller.controller_name == 'illustrations' %>
83
79
  <%= javascript_include_tag 'admin/illustrations' %>
84
80
  <% elsif controller.controller_name == 'menus' %>
85
81
  <%= javascript_include_tag 'admin/menus' %>
82
+ <% elsif controller.controller_name == 'courses' %>
83
+ <%= javascript_include_tag 'admin/courses' %>
86
84
  <% end %>
87
85
 
88
86
  </body>
@@ -1,3 +1,3 @@
1
1
  module TkhAdminPanel
2
- VERSION = "0.9.18"
2
+ VERSION = "0.9.19"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tkh_admin_panel
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.18
4
+ version: 0.9.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - Swami Atma
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-21 00:00:00.000000000 Z
11
+ date: 2014-06-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
@@ -142,6 +142,7 @@ files:
142
142
  - app/assets/images/glyphicons-halflings-regular.ttf
143
143
  - app/assets/images/glyphicons-halflings-regular.woff
144
144
  - app/assets/javascripts/admin.js
145
+ - app/assets/javascripts/admin/courses.js.coffee
145
146
  - app/assets/javascripts/admin/custom.js.coffee
146
147
  - app/assets/javascripts/admin/drag-and-sort.js.coffee
147
148
  - app/assets/javascripts/admin/illustrations.js.coffee