bandshell 0.0.21 → 0.8

data/lib/bandshell/application/views/netsettings.erb

@@ -0,0 +1,147 @@
+<script src="/javascripts/network.js"></script>
+
+<div class="clearfix">
+  <ul class="nav nav-tabs">
+    <li><a href="/setup">Basic Setup</a></li>
+    <li class="active"><a href="/netconfig">Network Settings</a></li>
+    <li><a href="/password">Configuration Password</a></li>
+  </ul>
+</div>
+
+<div>
+
+  <form method="post">
+    <fieldset>
+      <legend><span>Connection Type</span></legend>
+      
+      <div class="clearfix">
+        <select id="connection_type" name="connection_type">
+          <!--  list out our available connection methods as options set the html selected flag on the one that is currently selected in the config -->
+          <% CONNECTION_METHODS.each do |cm| %>
+            <option <%= cm==connection_method.class ? 'selected' : '' %> value="<%= cm.basename %>">
+              <%= cm.description %>
+            </option>
+          <% end %> 
+        </select>
+      </div>
+
+      <div id="connection">
+        <div id="WiredConnection" class="clearfix">
+          
+          <div class="clearfix">
+            <label for="WiredConnection_interface_name">Interface Name</label>
+            <div class="input">
+              <select id="interface_name" name="WiredConnection/interface_name">
+                <!--  list out available interfaces and their MAC addresses - preselect one if there was one chosen in config -->
+                <option value="">Auto Select</option>
+                <% Bandshell::WiredConnection.interfaces.each do |iface| %>
+                  <option <%= value_from(connection_method, :interface_name)==iface.name ? 'selected' : '' %> value="<%= iface.name %>">
+                    <%= iface.name %> - <%= iface.mac %>
+                  </option>
+                <% end %>
+              </select>
+            </div>
+          </div>
+
+        </div>
+
+        <div id="WirelessConnection" class="clearfix">
+          <div class="row-fluid">
+            <div class="span6">
+
+              <div class="clearfix">
+                <label for="WirelessConnection_interface_name">Interface Name</label>
+                <div class="input">
+                  <select id="interface_name" name="WirelessConnection/interface_name">
+                    <!--  same as above but with the wireless interfaces -->
+                    <option value="">Auto Select</option>
+                    <% Bandshell::WirelessConnection.interfaces.each do |iface| %>
+                      <option <%= value_from(connection_method, :interface_name) == iface.name ? 'selected' : '' %> value="<%= iface.name %>">
+                        <%= iface.name %> - <%= iface.mac %>
+                      </option>
+                    <% end %>
+                  </select>
+                </div>
+              </div>
+
+            </div>
+            <div class="span6">
+              
+              <div class="clearfix">
+                <label for="WirelessConnection_ssid">SSID</label>
+                <div class="input">
+                  <input name="WirelessConnection/ssid" type="text" class="fillWidth" value="<%= value_from(connection_method, :ssid) %>"></input>
+                </div>
+              </div>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </fieldset>
+
+    <fieldset>
+      <legend><span>IP Address</span></legend>
+
+      <div class="clearfix">
+        <select id="addressing_type" name="addressing_type">
+          <% ADDRESSING_METHODS.each do |am| %>
+            <option <%= am==addressing_method.class ? 'selected' : '' %> value="<%= am.basename %>">
+              <%= am.description %>
+            </option>
+          <% end %>
+        </select>
+      </div>
+
+      <div id="address">
+        <div id="DHCPAddressing" class="clearfix"></div>
+        <div id="StaticAddressing" class="clearfix">
+          <div class="row-fluid">
+            <div class="span6">
+              
+              <div class="clearfix">
+                <label for="StaticAddressing_address">Address</label>
+                <div class="input">
+                  <input name="StaticAddressing/address" type="text" class="fillWidth" value="<%= value_from(addressing_method, :address) %>"></input>
+                </div>
+              </div>
+
+              <div class="clearfix">
+                <label for="StaticAddressing_netmask">Netmask</label>
+                <div class="input">
+                  <input name="StaticAddressing/netmask" type="text" class="fillWidth" value="<%= value_from(addressing_method, :netmask) %>"></input>
+                </div>
+              </div>
+
+            </div><!-- end .span6 -->
+            <div class="span6">
+              
+              <div class="clearfix">
+                <label for="StaticAddressing_gateway">Gateway</label>
+                <div class="input">
+                  <input name="StaticAddressing/gateway" type="text" class="fillWidth" value="<%= value_from(addressing_method, :gateway) %>"></input>
+                </div>
+              </div>
+
+              <div class="clearfix">
+                <label for="StaticAddressing_address">Nameservers (separate with commas or spaces)</label>
+                <div class="input">
+                  <input name="StaticAddressing/nameservers_flat" type="text" class="fillWidth" value="<%= value_from(addressing_method, :nameservers_flat) %>"></input>
+                </div>
+              </div>
+
+            </div><!-- end .span6 -->
+
+          </div><!-- end .row-fluid -->
+
+        </div>
+      </div>
+    </fieldset>
+
+    <div class="default-padding" style="padding: 18px;">
+      <input type="submit" class="btn btn-primary"></input>
+    </div>
+
+  </form>
+</div>

data/lib/bandshell/application/views/netsettings.haml

@@ -1,4 +1,4 @@
-%script{:src=>"network.js"}
+%script{:src=>"/javascripts/network.js"}
 %a{:href=>"/setup"}="Back to setup"
 %h1="Concerto Player Network Configuration"
 %form{:method=>"post"}

data/lib/bandshell/application/views/password.erb

@@ -0,0 +1,23 @@
+<div class="clearfix">
+  <ul class="nav nav-tabs">
+    <li><a href="/setup">Basic Setup</a></li>
+    <li><a href="/netconfig">Network Settings</a></li>
+    <li class="active"><a href="/password">Configuration Password</a></li>
+  </ul>
+</div>
+
+<div class="default-padding">
+  <form method="post">
+    <p>
+      <label for="newpass">New Password</label>
+      <input class="input-large" name="newpass" type="password"></input>
+    </p>
+    <p>
+      <label for="newpass_confirm">Confirm Password</label>
+      <input class="input-large" name="newpass_confirm" type="password"></input>
+    </p>
+    <p>
+      <input type="submit" class="btn btn-primary" value="Change Password"></input>
+    </p>
+  </form>
+</div>

data/lib/bandshell/application/views/player_status.erb

@@ -0,0 +1,16 @@
+<p>System Uptime: <%= Uptime.uptime %></p>
+<p>System Processes:</p>
+<ul>
+  <% for p in @proctable %>
+    <li>
+      <b>
+        <%= p.comm %>
+      </b>
+      (PID <%= p.pid.to_s %>)
+    </li>
+  <% end %>
+</ul>
+<p>Screen on/off rules:</p>
+<pre>
+  <%= JSON.pretty_generate(@on_off_rules) %>
+</pre>

data/lib/bandshell/application/views/problem.erb

@@ -0,0 +1,20 @@
+<script src="/javascripts/problem.js"></script>
+<div class="error">
+  <p>
+    <img src="/trollface.png"/>
+  </p>
+  <h1>Problem?</h1>
+  <p>
+    Due to technical difficulties, this Concerto screen is currently not 
+    operational. Please check again soon.
+  </p>
+  <p>
+    The Concerto installation at <%= concerto_url %> could not be reached.
+  </p>
+  <p>
+    If the URL needs to be changed, go back to
+    <a href="/setup">
+      Player Configuration
+    </a>
+  </p>
+</div>

data/lib/bandshell/application/views/setup.erb

@@ -0,0 +1,58 @@
+<% unless @errors.nil? %>
+  <% @errors.each do |error| %>
+    <p style="color:red">
+      <%= error %>
+    </p>
+  <% end %>
+<% end %>
+
+<div class="clearfix">
+  <ul class="nav nav-tabs">
+    <li class="active"><a href="/setup">Basic Setup</a></li>
+    <li><a href="/netconfig">Network Settings</a></li>
+    <li><a href="/password">Configuration Password</a></li>
+  </ul>
+</div>
+
+<div class="default-padding">
+  <h3>We need the URL of your Concerto instance before we can get up and running.</h3>
+  <br />
+
+  <form method="post">
+    <fieldset style="padding: 0px;">
+      <div class="row-fluid">
+        <div class="span10">
+          <input id="url" name="url" placeholder="Enter URL (e.g. http://10.0.0.1)" class="fillWidth" style="margin-bottom: 6px;" type="text" value="<%= @url %>" />
+        </div>
+        <div class="span2">
+          <input type="submit" class="btn large btn-primary" value="Get Started" />
+        </div>
+      </div>
+    </fieldset>
+  </form>
+
+  <br />
+
+  <div class="alert alert-block alert-zero">
+    <table style="margin: 0px;" cellpadding="0" cellspacing="0" border="0">
+      <tbody>
+        <tr>
+          <td><p>IP Address:</p></td>
+          <td><p><b class="pronounced"><%= my_ip %></b></p></td>
+        </tr>
+        <tr>
+          <td><p>Default Username:</p></td>
+          <td><p><b class="pronounced">root</b></p></td>
+        </tr>
+        <tr>
+          <td><p>Default Password:</p></td>
+          <td><p><b class="pronounced">default</b></p></td>
+        </tr>
+        <tr>
+          <td><p>Access this page with URL:</p></td>
+          <td><p><b class="pronounced"><a href="http://<%= my_ip %>:<%= my_port %>/setup">http://<%= my_ip %>:<%= my_port %>/setup</a></b></p></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bandshell
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: '0.8'
 platform: ruby
 authors:
-- Andrew Armenia
+- Concerto Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Client-side tools for Concerto digital signage
-email: andrew@asquaredlabs.com
+email: team@concerto-signage.org
 executables:
 - concerto_netsetup
 - bandshelld
@@ -104,17 +104,61 @@ extra_rdoc_files: []
 files:
 - lib/bandshell/application/app.rb
 - lib/bandshell/application/config.ru
-- lib/bandshell/application/public/authenticate.js
-- lib/bandshell/application/public/network.js
-- lib/bandshell/application/public/problem.js
-- lib/bandshell/application/public/stylesheet.css
+- lib/bandshell/application/public/images/elements/logomark.png
+- lib/bandshell/application/public/images/layout/pagebg.gif
+- lib/bandshell/application/public/images/layout/pagebg@2x.gif
+- lib/bandshell/application/public/javascripts/authenticate.js
+- lib/bandshell/application/public/javascripts/network.js
+- lib/bandshell/application/public/javascripts/problem.js
+- lib/bandshell/application/public/stylesheets/README
+- lib/bandshell/application/public/stylesheets/concerto-styles.css
+- lib/bandshell/application/public/stylesheets/sass/common/concertocons.scss
+- lib/bandshell/application/public/stylesheets/sass/common/font-awesome.scss
+- lib/bandshell/application/public/stylesheets/sass/common/mixins.scss
+- lib/bandshell/application/public/stylesheets/sass/common/reset.scss
+- lib/bandshell/application/public/stylesheets/sass/common/variables.scss
+- lib/bandshell/application/public/stylesheets/sass/components/alerts-badges.scss
+- lib/bandshell/application/public/stylesheets/sass/components/bootstrap-modals.scss
+- lib/bandshell/application/public/stylesheets/sass/components/button-groups.scss
+- lib/bandshell/application/public/stylesheets/sass/components/buttons.scss
+- lib/bandshell/application/public/stylesheets/sass/components/datepicker.scss
+- lib/bandshell/application/public/stylesheets/sass/components/display-blocks.scss
+- lib/bandshell/application/public/stylesheets/sass/components/forms.scss
+- lib/bandshell/application/public/stylesheets/sass/components/jquery.qtip2.scss
+- lib/bandshell/application/public/stylesheets/sass/components/jquery.timepicker.css
+- lib/bandshell/application/public/stylesheets/sass/components/jquery.timepicker.scss
+- lib/bandshell/application/public/stylesheets/sass/components/lists-grid-stacked.scss
+- lib/bandshell/application/public/stylesheets/sass/components/navs.scss
+- lib/bandshell/application/public/stylesheets/sass/components/pagination.scss
+- lib/bandshell/application/public/stylesheets/sass/components/scaffolding.scss
+- lib/bandshell/application/public/stylesheets/sass/components/screenmodel.scss
+- lib/bandshell/application/public/stylesheets/sass/components/sliders.scss
+- lib/bandshell/application/public/stylesheets/sass/components/tables.scss
+- lib/bandshell/application/public/stylesheets/sass/components/tiles.scss
+- lib/bandshell/application/public/stylesheets/sass/components/topmenu.scss
+- lib/bandshell/application/public/stylesheets/sass/components/type.scss
+- lib/bandshell/application/public/stylesheets/sass/index-manifest.scss
+- lib/bandshell/application/public/stylesheets/sass/responsive/responsive-1200px-min.scss
+- lib/bandshell/application/public/stylesheets/sass/responsive/responsive-767px-max.scss
+- lib/bandshell/application/public/stylesheets/sass/responsive/responsive-768px-979px.scss
+- lib/bandshell/application/public/stylesheets/sass/responsive/responsive-utilities.scss
+- lib/bandshell/application/public/stylesheets/sass/views/setup.scss
+- lib/bandshell/application/public/stylesheets/sass/views/submissions.scss
+- lib/bandshell/application/public/stylesheets/sass/views/users.scss
 - lib/bandshell/application/public/trollface.png
+- lib/bandshell/application/views/authenticate.erb
 - lib/bandshell/application/views/authenticate.haml
+- lib/bandshell/application/views/main.erb
 - lib/bandshell/application/views/main.haml
+- lib/bandshell/application/views/netsettings.erb
 - lib/bandshell/application/views/netsettings.haml
+- lib/bandshell/application/views/password.erb
 - lib/bandshell/application/views/password.haml
+- lib/bandshell/application/views/player_status.erb
 - lib/bandshell/application/views/player_status.haml
+- lib/bandshell/application/views/problem.erb
 - lib/bandshell/application/views/problem.haml
+- lib/bandshell/application/views/setup.erb
 - lib/bandshell/application/views/setup.haml
 - lib/bandshell/config_store.rb
 - lib/bandshell/hardware_api.rb

data/lib/bandshell/application/public/stylesheet.css

@@ -1,3 +0,0 @@
-.error {
-    text-align: center;
-}