tkh_admin_panel 0.2.4.1 → 0.2.5

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 (5) hide show
  1. data/CHANGELOG.md +6 -0
  2. data/app/assets/javascripts/admin.js +1 -0
  3. data/app/views/layouts/admin.html.erb +4 -3
  4. data/lib/tkh_admin_panel/version.rb +1 -1
  5. metadata +2 -2
data/CHANGELOG.md CHANGED
@@ -2,6 +2,12 @@
2
2
 
3
3
 
4
4
 
5
+ ## 0.2.5
6
+
7
+ * Fixed info in footer and place an hr tag above it
8
+ * admin.js requires jquery-ui to be needed for the reordering of items later on
9
+
10
+
5
11
  ## 0.2.4
6
12
 
7
13
  * Disabled tkh_editor - Will replace it soon
data/app/assets/javascripts/admin.js CHANGED
@@ -5,6 +5,7 @@
5
5
  // the compiled file.
6
6
  //
7
7
  //= require jquery
8
+ //= require jquery-ui
8
9
  //= require jquery_ujs
9
10
  //= require bootstrap
10
11
  //= require bootstrap-wysihtml5-all
data/app/views/layouts/admin.html.erb CHANGED
@@ -64,9 +64,10 @@
64
64
 
65
65
  <div class="row-fluid">
66
66
  <footer class="span12">
67
- <p><b><%= defined?(APP_SETTINGS) && APP_SETTINGS['web_shop_name'] || "Ten Thousand Hours" %></b><br />
68
- <%= defined?(APP_SETTINGS) && APP_SETTINGS['web_shop_short_url'] && APP_SETTINGS['web_shop_url'] ? link_to(APP_SETTINGS['web_shop_short_url'], APP_SETTINGS['web_shop_url']) : link_to("http://TenThousandHours.eu", 'http://TenThousandHours.eu') %><br />
69
- <%= defined?(APP_SETTINGS) && APP_SETTINGS['web_shop_email'] ? link_to(APP_SETTINGS['web_shop_email'], 'mailto:' + APP_SETTINGS['web_shop_email']) : link_to("swami@TenThousandHours.eu", 'mailto:http://TenThousandHours.eu') %><br /></p>
67
+ <hr>
68
+ <p><b>Ten Thousand Hours</b><br />
69
+ <%= link_to "http://tenthousandhours.eu", "http://tenthousandhours.eu" %><br />
70
+ <%= link_to "Contact TKH", "http://tenthousandhours.eu/pages/5-contact-form" %><br /></p>
70
71
  </footer>
71
72
  </div>
72
73
 
data/lib/tkh_admin_panel/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module TkhAdminPanel
2
- VERSION = "0.2.4.1"
2
+ VERSION = "0.2.5"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tkh_admin_panel
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4.1
4
+ version: 0.2.5
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-01-04 00:00:00.000000000 Z
12
+ date: 2013-01-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties