concerto_hardware 0.0.7 → 0.0.8

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: 3e5b029ac779d47ff507e317a6cf81cff535234c
4
- data.tar.gz: e555cf4fb696e6a492b7714b901615c8fd3890f3
3
+ metadata.gz: 1af84184d8d8a02978e2e9d37a561b3314934e29
4
+ data.tar.gz: e2fdede070f4d6b900a1455fd149a14a1b1965de
5
5
  SHA512:
6
- metadata.gz: 62594594cfa2a92502262894578ba90cdf99b04c692e7b16c1bcd207abb3a573db80b85ddbc6b6a7b26ed9381de1383611fd796bbfe44ecc7b957c174e3e3b2e
7
- data.tar.gz: 5969ec4a9c47dd55aab1429d70e7305fd68177bff4432223721eaa4e659b42b33c79847c40bcd5add1969d9233a4cbbad74cbbf2513150bd5afbbafb3cfbecd0
6
+ metadata.gz: 7f1764bcbf571e0a70795a5b55e9c10114f6004e7777b3d603e0d2617caced4c79ca28b687a02fc00e94913109ad54dba8ebc960909121c6e2761ebbad71df84
7
+ data.tar.gz: c5a7ba0cf5e2172b4cb990476cccbcd007e1feae5bb91a232168c96f80cfa210f47377b5bbb282c43c21fc1e74781c756731904030cb972da81545baefdf99fb
@@ -1,49 +1,48 @@
1
1
  <%# This partial will be read in the context of the main Concerto app. %>
2
2
  <%# URL helpers require use of the 'hardware' routing helper. %>
3
3
  <%# ConcertoHardware authorization rules are automatically provided. %>
4
+ <section class="viewblock">
5
+ <header class="viewblock-header">
6
+ <div class="viewblock-header_right">
7
+ <div class="button-padding">
8
+ <% if @player.nil? && (can? :create, ConcertoHardware::Player) %>
9
+ <%= link_to 'Add Player', hardware.new_player_path(:screen_id => @screen.id), :class => "btn" %>
10
+ <% else %>
11
+ <% if can? :update, @player %>
12
+ <%= link_to 'Edit Player', hardware.edit_player_path(@player), :class => "btn" %>
13
+ <% end %>
14
+ <% end %>
15
+ </div>
16
+ </div>
4
17
 
5
- <section class="viewblock">
6
- <header class="viewblock-header">
7
- <div class="viewblock-header_right">
8
- <div class="button-padding">
18
+ <div class="default-padding">
19
+ <h1><%= t('.concerto_player') %></h1>
20
+ </div>
21
+ </header>
22
+ <div class="viewblock-cont">
23
+ <div class="default-padding">
9
24
  <% if @player.nil? %>
10
- <%= link_to 'Add Player', hardware.new_player_path(:screen_id => @screen.id), :class => "btn" %>
25
+ <div class="alert alert-block alert-zero">
26
+ <p class="alert-heading"><%= t('.no_player_header') %></p>
27
+ <p><%= t('.no_player_msg') %></p>
28
+ <% if can? :update, @player %>
29
+ <%= link_to t('.add_player_msg'), hardware.new_player_path(:screen_id => @screen.id) %>
30
+ <% end %>
31
+ </div>
11
32
  <% else %>
12
- <% if can? :update, @player %>
13
- <%= link_to 'Edit Player', hardware.edit_player_path(@player), :class => "btn" %>
33
+ <h3><%= @screen.name + " Player" %></h3>
34
+ <p><b><%= @player.activated ? t('.activated') : t('.not_activated') %></b></p>
35
+ <br />
36
+ <% if can? :read, @player %>
37
+ <% if current_user %><p><b>IP Address:</b> <%= @player.ip_address %></p><% end %>
38
+ <p><b>Screen On/Off Times:</b></p>
39
+ <ul>
40
+ <% @player.describe_screen_on_off.each do |rule| %>
41
+ <li><%= rule %></li>
42
+ <% end %>
43
+ </ul>
14
44
  <% end %>
15
45
  <% end %>
16
46
  </div>
17
47
  </div>
18
-
19
- <div class="default-padding">
20
- <h1><%= t('.concerto_player') %></h1>
21
- </div>
22
- </header>
23
- <div class="viewblock-cont">
24
- <div class="default-padding">
25
- <% if @player.nil? %>
26
- <div class="alert alert-block alert-zero">
27
- <p class="alert-heading"><%= t('.no_player_header') %></p>
28
- <p><%= t('.no_player_msg') %></p>
29
- <% if can? :update, @player %>
30
- <%= link_to t('.add_player_msg'), hardware.new_player_path(:screen_id => @screen.id) %>
31
- <% end %>
32
- </div>
33
- <% else %>
34
- <h3><%= @screen.name + " Player" %></h3>
35
- <p><b><%= @player.activated ? t('.activated') : t('.not_activated') %></b></p>
36
- <br />
37
- <% if can? :read, @player %>
38
- <p><b>IP Address:</b> <%= @player.ip_address %></p>
39
- <p><b>Screen On/Off Times:</b></p>
40
- <ul>
41
- <% @player.describe_screen_on_off.each do |rule| %>
42
- <li><%= rule %></li>
43
- <% end %>
44
- </ul>
45
- <% end %>
46
- <% end %>
47
- </div>
48
- </div>
49
- </section>
48
+ </section>
@@ -1,3 +1,3 @@
1
1
  module ConcertoHardware
2
- VERSION = "0.0.7"
2
+ VERSION = "0.0.8"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: concerto_hardware
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.7
4
+ version: 0.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Concerto Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-28 00:00:00.000000000 Z
11
+ date: 2014-06-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails