ucpengine 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e52fd2b30b8d7e1ef6ab976da29823517cd29482
-  data.tar.gz: a6f4c5cfffea73f93bfdeea02184653b100ae54c
+  metadata.gz: 6e80372e147506899f07433ae9ad5ec08ccdfbb0
+  data.tar.gz: bf42b5bca40a8cea7390cba9aac03fe9a1e59c54
 SHA512:
-  metadata.gz: 2c1dd3299389f9bdbb319eba9def22e06b62f7a48bc08078e1aff1fcb802bd146e428094a3442db1332680bce5802e93e4435b83e75905b1e194db8b1e8ddb81
-  data.tar.gz: d06c66ac2bb3a900153a418e2bd7af171375c69ddc2ec37597321bd0177b79817451a0d27393697ac0ee1b5f9167990df48f7d015143a965f074bb133e9bd26d
+  metadata.gz: 8eb6c96c555132761a7e007e7d0e32f3b680ebd0940b8f9340bd5cdf3fc887ff427d55262ac451be7dfe4f111258d636043f7c0af0787abdd32a4dc34e78156d
+  data.tar.gz: 73f5e64026809668d8be75424484f45339966ce35f9a0809ee235e4d1ff53e03da1a9b92e2d46bab3f652c3c493c2da6397185e5cc8cf300db86c2ef8d103eea

data/app/assets/javascripts/ucpengine/application.js

@@ -13,3 +13,12 @@
 //= require jquery
 //= require jquery_ujs
 //= require_tree .
+
+$(document).ready(function() {
+    $('select').material_select();
+    $('.datepicker').pickadate({
+    selectMonths: true, // Creates a dropdown to control month
+    selectYears: 15 // Creates a dropdown of 15 years to control year
+  });
+  $('ul.tabs').tabs();
+});

data/app/assets/stylesheets/ucpengine/application.scss

@@ -25,11 +25,47 @@ nav {
 }
 .row{
   height:1200px;
-  .col{
-    padding:0 !important;
+}
+.ucp-inner-content{
+  padding:0 !important;
+  .inner-content-table{
+    padding-top:40px;
+  }
+}
+.ucp-inner-content-header{
+  border-bottom: 1px solid rgba(128, 128, 128, 0.15);
+  //height:40px;
+  padding:15px !important;
+  background:#FAFAFA;
+  .btn {
+    font-size:0.8em;
+    letter-spacing:2px;
+    height:25px;
+    line-height:25px;
+    float:right;
   }
 }
+.tabs {
+  .tab{
+    a{
+      letter-spacing:1px;
+      font-size:0.8em !important;
+      color:rgba(32, 44, 49, 0.57) !important;
+    }
+    a.active{
+      color:#202c31 !important;
+    }
+  }
+}
+.indicator{
+  bottom:4px;
+  background-color:rgba(32, 44, 49, 0.57) !important;
+}
+.badge{
+  background-color:#81a6a6 !important;
+}
 .ucp-sidenav{
+  padding:0 !important;
   height:100%;
     background:#ececec ;
 }

data/app/controllers/ucpengine/entries_controller.rb

@@ -6,6 +6,9 @@ module Ucpengine
 
    def index
      @entries = Entry.where(type: content_class)
+     @terms_of_use = Entry.where(service_type: 'Terms of Use')
+     @third_party_terms_of_use = Entry.where(service_type: 'Third Party Terms of Use')
+     @privacy_policy = Entry.where(service_type: 'Privacy_policy')
    end
 
    def show
@@ -49,7 +52,7 @@ module Ucpengine
    end
 
    def entry_params
-     allowed_attrs = %i(id type termsofservice version slug published_at)
+     allowed_attrs = %i(id type service_body service_type version slug published_at)
        .concat(content_class.constantize.content_attributes.keys)
 
      params.require(:entry).permit(*allowed_attrs)

data/app/views/layouts/ucpengine/application.html.erb

@@ -25,13 +25,13 @@
        <ul class="collection">
            <% Ucpengine.configuration.content_classes.each do |class_name| %>
              <li class="collection-item sidenav-item">
-               <%= link_to 'Terms of Service Dashboard', entries_path(content_class: class_name.tableize) %>
+               <%= link_to 'Service Dashboard', entries_path(content_class: class_name.tableize) %>
              </li>
            <% end %>
          </ul>
      </div>
 
-     <div class="col s9">
+     <div class="col s9 ucp-inner-content">
 
 <%= yield %>
 </div>

data/app/views/ucpengine/dashboard/index.html.erb

@@ -1,3 +1,3 @@
 <div class="container dashboard-welcome">
-  <p>Welcome to the UCP cms dashboard. Easily create and manage multiple Terms of Service versions.</p>
+  <p>Welcome to the UCP cms dashboard. Easily create and manage multiple Service types and versions.</p>
 </div>

data/app/views/ucpengine/entries/_form.html.erb

@@ -1,22 +1,21 @@
 <div class="row tos-form">
   <div class="col s6">
-<%= form_for(@entry, as: :entry, url: @entry.persisted? ? content_entry_path(@entry) : entries_path) do |f| %>
+<%= simple_form_for(@entry, as: :entry, url: @entry.persisted? ? content_entry_path(@entry) : entries_path) do |f| %>
     <%= f.hidden_field :type, value: @entry.type %>
 
-    <%= f.label :version %>
-    <%= f.text_field :version %>
-
+    <%= f.datetime_field :version %>
+    <%= f.input :service_type, collection: ['Terms of Use', 'Third Party Terms of Use', 'Privacy Policy', 'GLBA Privacy Policy'], prompt: 'Select Service Type' %>
     <!--
     <%= f.label :published_at %>
     <%= f.text_field :published_at %>
     -->
       <div class="input-field col s12">
         <% @entry.class.content_attributes.each do |attr_name, attr_type| %>
-          <%= f.text_area attr_name, as: attr_type, class: 'materialize-textarea', placeholder: 'Terms of Service' %>
+          <%= f.text_area attr_name, as: attr_type, class: 'materialize-textarea', placeholder: 'New Service Agreement' %>
         <% end %>
       </div>
 
-    <%= f.submit "Create and Save", class: 'btn' %>
+    <%= f.button :submit %>
   <% end %>
 </div>
 <div class="col s5">

data/app/views/ucpengine/entries/index.html.erb

@@ -1,20 +1,97 @@
+<div class="row">
+  <div class="col s12 ucp-inner-content-header">
+    <%= link_to "New Service Post", new_content_entry_path, class: 'btn' %>
+  </div>
+  <div class="col s12">
 
-<table class="highlight">
-  <%= link_to "New #{content_class.titleize}", new_content_entry_path %>
-  <thead>
-    <tr>
-      <th>Version</th>
-      <th>Created</td>
-      <th>Options</th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @entries.each do |entry| %>
-    <tr>
-      <td><%= link_to entry.version, content_entry_path(entry) %></td>
-      <td><%= time_ago_in_words entry.created_at %> ago</td>
-      <td><%= link_to 'Edit', edit_content_entry_path(entry) %>
-      <%= link_to 'Destroy', content_entry_path(entry), method: :delete, data: { confirm: 'Are you sure?' } %></td>
-    </tr>
-    <% end %>
-</table>
+    <ul class="tabs">
+      <li class="tab col s3"><a href="#terms_of_use">Terms of Use <span class="new badge"><%= @terms_of_use.count %></span></a></li>
+      <li class="tab col s3"><a href="#third_party_terms_of_use">Third Party Terms of Use <span class="new badge"><%= @terms_of_use.count %></a></li>
+      <li class="tab col s3"><a href="#privacy_policy">Privacy Policy <span class="new badge"><%= @terms_of_use.count %></a></li>
+      <li class="tab col s3"><a href="#glba_privacy_policy">GLBA Privacy Policy <span class="new badge"><%= @terms_of_use.count %></a></li>
+    </ul>
+  </div>
+  <div id="terms_of_use" class="col s12 inner-content-table">
+    <table class="highlight">
+      <thead>
+        <tr>
+          <th>Version</th>
+          <th>Created</td>
+          <th>Options</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @terms_of_use.each do |entry| %>
+        <tr>
+          <td><%= link_to entry.version, content_entry_path(entry) %></td>
+          <td><%= time_ago_in_words entry.created_at %> ago</td>
+          <td><%= link_to 'Edit', edit_content_entry_path(entry) %>
+          <%= link_to 'Destroy', content_entry_path(entry), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+        <% end %>
+    </table>
+  </div>
+  <div id="third_party_terms_of_use" class="col s12">
+    <table class="highlight">
+      <thead>
+        <tr>
+          <th>Version</th>
+          <th>Created</td>
+          <th>Options</th>
+        </tr>
+      </thead>
+      <tbody>
+        <%= @third_party_terms_of_use.count %>
+        <% @third_party_terms_of_use.each do |entry| %>
+        <tr>
+          <td><%= link_to entry.version, content_entry_path(entry) %></td>
+          <td><%= time_ago_in_words entry.created_at %> ago</td>
+          <td><%= link_to 'Edit', edit_content_entry_path(entry) %>
+          <%= link_to 'Destroy', content_entry_path(entry), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+        <% end %>
+    </table>
+  </div>
+  <div id="privacy_policy" class="col s12">
+    <table class="highlight">
+      <thead>
+        <tr>
+          <th>Version</th>
+          <th>Created</td>
+          <th>Options</th>
+        </tr>
+      </thead>
+      <tbody>
+        <%= @privacy_policy.count %>
+        <% @privacy_policy.each do |entry| %>
+        <tr>
+          <td><%= link_to entry.version, content_entry_path(entry) %></td>
+          <td><%= time_ago_in_words entry.created_at %> ago</td>
+          <td><%= link_to 'Edit', edit_content_entry_path(entry) %>
+          <%= link_to 'Destroy', content_entry_path(entry), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+        <% end %>
+    </table>
+  </div>
+  <div id="glba_privacy_policy" class="col s12">
+    <table class="highlight">
+      <thead>
+        <tr>
+          <th>Version</th>
+          <th>Created</td>
+          <th>Options</th>
+        </tr>
+      </thead>
+      <tbody>
+        <%= @privacy_policy.count %>
+        <% @privacy_policy.each do |entry| %>
+        <tr>
+          <td><%= link_to entry.version, content_entry_path(entry) %></td>
+          <td><%= time_ago_in_words entry.created_at %> ago</td>
+          <td><%= link_to 'Edit', edit_content_entry_path(entry) %>
+          <%= link_to 'Destroy', content_entry_path(entry), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+        <% end %>
+    </table>
+  </div>
+</div>

data/app/views/ucpengine/entries/show.html.erb

@@ -5,7 +5,7 @@
 
 <p>
   <strong>Terms of Service:</strong>
-  <%= @entry.termsofservice %>
+  <%= @entry.service_body %>
 </p>
 
 

data/config/initializers/simple_form.rb

@@ -0,0 +1,165 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  # Wrappers are used by the form builder to generate a
+  # complete input. You can remove any component from the
+  # wrapper, change the order or even add your own to the
+  # stack. The options given below are used to wrap the
+  # whole input.
+  config.wrappers :default, class: :input,
+    hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+    ## Extensions enabled by default
+    # Any of these extensions can be disabled for a
+    # given input by passing: `f.input EXTENSION_NAME => false`.
+    # You can make any of these extensions optional by
+    # renaming `b.use` to `b.optional`.
+
+    # Determines whether to use HTML5 (:email, :url, ...)
+    # and required attributes
+    b.use :html5
+
+    # Calculates placeholders automatically from I18n
+    # You can also pass a string as f.input placeholder: "Placeholder"
+    b.use :placeholder
+
+    ## Optional extensions
+    # They are disabled unless you pass `f.input EXTENSION_NAME => true`
+    # to the input. If so, they will retrieve the values from the model
+    # if any exists. If you want to enable any of those
+    # extensions by default, you can change `b.optional` to `b.use`.
+
+    # Calculates maxlength from length validations for string inputs
+    b.optional :maxlength
+
+    # Calculates pattern from format validations for string inputs
+    b.optional :pattern
+
+    # Calculates min and max from length validations for numeric inputs
+    b.optional :min_max
+
+    # Calculates readonly automatically from readonly attributes
+    b.optional :readonly
+
+    ## Inputs
+    b.use :label_input
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
+
+    ## full_messages_for
+    # If you want to display the full error message for the attribute, you can
+    # use the component :full_error, like:
+    #
+    # b.use :full_error, wrap_with: { tag: :span, class: :error }
+  end
+
+  # The default wrapper to be used by the FormBuilder.
+  config.default_wrapper = :default
+
+  # Define the way to render check boxes / radio buttons with labels.
+  # Defaults to :nested for bootstrap config.
+  #   inline: input + label
+  #   nested: label > input
+  config.boolean_style = :nested
+
+  # Default class for buttons
+  config.button_class = 'btn'
+
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # Use :to_sentence to list all errors for each field.
+  # config.error_method = :first
+
+  # Default tag used for error notification helper.
+  config.error_notification_tag = :div
+
+  # CSS class to add for error notification helper.
+  config.error_notification_class = 'error_notification'
+
+  # ID to add for error notification helper.
+  # config.error_notification_id = nil
+
+  # Series of attempts to detect a default label method for collection.
+  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
+
+  # Series of attempts to detect a default value method for collection.
+  # config.collection_value_methods = [ :id, :to_s ]
+
+  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+  # config.collection_wrapper_tag = nil
+
+  # You can define the class to use on all collection wrappers. Defaulting to none.
+  # config.collection_wrapper_class = nil
+
+  # You can wrap each item in a collection of radio/check boxes with a tag,
+  # defaulting to :span.
+  # config.item_wrapper_tag = :span
+
+  # You can define a class to use in all item wrappers. Defaulting to none.
+  # config.item_wrapper_class = nil
+
+  # How the label text should be generated altogether with the required text.
+  # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
+
+  # You can define the class to use on all labels. Default is nil.
+  # config.label_class = nil
+
+  # You can define the default class to be used on forms. Can be overriden
+  # with `html: { :class }`. Defaulting to none.
+  # config.default_form_class = nil
+
+  # You can define which elements should obtain additional classes
+  # config.generate_additional_classes_for = [:wrapper, :label, :input]
+
+  # Whether attributes are required by default (or not). Default is true.
+  # config.required_by_default = true
+
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
+  config.browser_validations = false
+
+  # Collection of methods to detect if a file type was given.
+  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
+
+  # Custom mappings for input types. This should be a hash containing a regexp
+  # to match as key, and the input type that will be used when the field name
+  # matches the regexp as value.
+  # config.input_mappings = { /count/ => :integer }
+
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # config.wrapper_mappings = { string: :prepend }
+
+  # Namespaces where SimpleForm should look for custom input classes that
+  # override default inputs.
+  # config.custom_inputs_namespaces << "CustomInputs"
+
+  # Default priority for time_zone inputs.
+  # config.time_zone_priority = nil
+
+  # Default priority for country inputs.
+  # config.country_priority = nil
+
+  # When false, do not use translations for labels.
+  # config.translate_labels = true
+
+  # Automatically discover new inputs in Rails' autoload path.
+  # config.inputs_discovery = true
+
+  # Cache SimpleForm inputs discovery
+  # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
+
+  # Define the default class of the input wrapper of the boolean input.
+  config.boolean_label_class = 'checkbox'
+
+  # Defines if the default input wrapper class should be included in radio
+  # collection wrappers.
+  # config.include_default_input_wrapper_class = true
+
+  # Defines which i18n scope will be used in Simple Form.
+  # config.i18n_scope = 'simple_form'
+end

data/db/migrate/20161118184506_rename_termsofservice_to_service_body_in_ucpengine_entries.rb

@@ -0,0 +1,9 @@
+class RenameTermsofserviceToServiceBodyInUcpengineEntries < ActiveRecord::Migration
+  def up
+    rename_column :ucpengine_entries, :termsofservice, :service_body
+  end
+
+  def down
+    rename_column :ucpengine_entries, :service_body, :termsofservice
+  end
+end

data/db/migrate/20161118184650_remove_version_from_ucpengine_entries.rb

@@ -0,0 +1,5 @@
+class RemoveVersionFromUcpengineEntries < ActiveRecord::Migration
+  def change
+    remove_column :ucpengine_entries, :version, :decimal
+  end
+end

data/db/migrate/20161118184744_add_version_new_to_ucpengine_entries.rb

@@ -0,0 +1,5 @@
+class AddVersionNewToUcpengineEntries < ActiveRecord::Migration
+  def change
+    add_column :ucpengine_entries, :version, :datetime
+  end
+end

data/db/migrate/20161118190004_add_service_type_to_ucpengine_entries.rb

@@ -0,0 +1,5 @@
+class AddServiceTypeToUcpengineEntries < ActiveRecord::Migration
+  def change
+    add_column :ucpengine_entries, :service_type, :string
+  end
+end

data/lib/ucpengine/version.rb

@@ -1,3 +1,3 @@
 module Ucpengine
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ucpengine
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - johnvehr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -211,12 +211,17 @@ files:
 - app/views/ucpengine/entries/new.html.erb
 - app/views/ucpengine/entries/show.html.erb
 - app/views/ucpengine/previews/show.html.erb
+- config/initializers/simple_form.rb
 - config/locales/simple_form.en.yml
 - config/routes.rb
 - db/migrate/20161028170915_create_ucpengine_entries.rb
 - db/migrate/20161028204606_create_ucpengine_entry_search_data.rb
 - db/migrate/20161102192430_add_slug_to_ucpengine_entries.rb
 - db/migrate/20161102192856_add_published_at_to_ucpengine_entries.rb
+- db/migrate/20161118184506_rename_termsofservice_to_service_body_in_ucpengine_entries.rb
+- db/migrate/20161118184650_remove_version_from_ucpengine_entries.rb
+- db/migrate/20161118184744_add_version_new_to_ucpengine_entries.rb
+- db/migrate/20161118190004_add_service_type_to_ucpengine_entries.rb
 - lib/tasks/ucpengine_tasks.rake
 - lib/templates/erb/scaffold/_form.html.erb
 - lib/ucpengine.rb
@@ -286,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Summary of Ucpengine.