hobo_bootstrap 2.0.0.pre3 → 2.0.0.pre4

data/README.md

@@ -15,7 +15,7 @@ Install instructions
 
 Add this to your Gemfile
 
-    gem "hobo_bootstrap", :git => "git://github.com/suyccom/hobo_bootstrap.git"
+    gem "hobo_bootstrap", :git => "git://github.com/Hobo/hobo_bootstrap.git"
     gem 'will_paginate-bootstrap'
     group :assets do
       # ... Other stuff ... #
@@ -192,10 +192,10 @@ Notes
 Right now, you still need to keep "hobo_clean" in your Gemfile if you want to use the Ajax search enabled by default in Hobo.
 
 
-  [1]: https://github.com/suyccom/hobo_bootstrap/raw/master/screenshots/index.png
-  [2]: https://github.com/suyccom/hobo_bootstrap/raw/master/screenshots/login.png
-  [3]: https://github.com/suyccom/hobo_bootstrap/raw/master/screenshots/top_menu.png
-  [4]: https://github.com/suyccom/hobo_bootstrap/raw/master/screenshots/sub_menu.png
-  [5]: https://github.com/suyccom/hobo_bootstrap/raw/master/screenshots/responsive.png
-  [6]: https://github.com/suyccom/hobo_bootstrap/raw/master/screenshots/two_columns.png
-  [7]: https://github.com/suyccom/hobo_bootstrap/raw/master/screenshots/three_columns_complex.png
+  [1]: https://github.com/Hobo/hobo_bootstrap/raw/master/screenshots/index.png
+  [2]: https://github.com/Hobo/hobo_bootstrap/raw/master/screenshots/login.png
+  [3]: https://github.com/Hobo/hobo_bootstrap/raw/master/screenshots/top_menu.png
+  [4]: https://github.com/Hobo/hobo_bootstrap/raw/master/screenshots/sub_menu.png
+  [5]: https://github.com/Hobo/hobo_bootstrap/raw/master/screenshots/responsive.png
+  [6]: https://github.com/Hobo/hobo_bootstrap/raw/master/screenshots/two_columns.png
+  [7]: https://github.com/Hobo/hobo_bootstrap/raw/master/screenshots/three_columns_complex.png

data/VERSION

@@ -1 +1 @@
-2.0.0.pre3
+2.0.0.pre4

data/hobo_bootstrap.gemspec

@@ -6,13 +6,13 @@ Gem::Specification.new do |s|
 
   s.authors = ['Ignacio Huerta']
   s.email = 'ignacio@ihuerta.net'
-  s.homepage = 'https://github.com/suyccom/hobo_bootstrap'
+  s.homepage = 'https://github.com/Hobo/hobo_bootstrap'
   s.rubyforge_project = 'hobo'
   s.summary = 'A bootstrap based theme for Hobo'
   s.description = 'A bootstrap based theme for Hobo'
 
   s.add_runtime_dependency('hobo', "~> 2.0.0.pre1")
-  s.add_runtime_dependency('hobo_jquery_ui', ["= #{version}"])
+  s.add_runtime_dependency('hobo_jquery_ui', "~> 2.0.0.pre1")
   s.add_runtime_dependency "compass_twitter_bootstrap", "~> 2.0.3"
   s.add_runtime_dependency "compass-rails", "~> 1.0.3"
   s.add_runtime_dependency "will_paginate-bootstrap", "~> 0.2.1"

data/taglibs/alert_box.dryml

@@ -0,0 +1,14 @@
+<!-- Renders an alert with bootstrap style
+
+### Attributes
+
+- `type`: chooses which flash message to display and also the box style.   The default is `notice`.   `error`, `success` and `info` also have styling.
+- `no-close`: if set, the alert doesn't have a close button
+ -->
+<def tag="alert-box" attrs="type, no-close">
+  <% type = type ? type.to_sym : :notice -%>
+  <div class="alert alert-#{type}" unless="&no_close" merge-attrs>
+    <a class="close" data-dismiss="alert" href="#" param="close">×</a>
+    <span param="default"/>
+  </div>
+</def>

data/taglibs/error_messages.dryml

@@ -0,0 +1,21 @@
+<!-- Renders a localized list of error messages following a form submission. Expects the errors to be in `this.errors`. Renders nothing if there are no errors.
+  -->
+<def tag="error-messages">
+  <section class="error-messages alert" merge-attrs if="&this.errors.size > 0">
+    <h2 param="heading">
+      <t key="activerecord.errors.template.header" model="&this.class.model_name.human" count="&this.errors.size">
+        <%= model = this.class.model_name.human
+            count = this.errors.size
+        count==1 ? "1 error prohibited this #{model} from being saved" :
+                   "#{count} errors prohibited this #{model} from being saved"
+        %>
+      </t>
+    </h2>
+    <t key="activerecord.errors.template.body">There were problems with the following fields:</t>
+    <ul param class="alert-block">
+      <% this.errors.to_a.each do |message| -%>
+      <li param><%= message %></li>
+      <% end -%>
+    </ul>
+  </section>
+</def>

data/taglibs/flash_message.dryml

@@ -3,11 +3,11 @@
 ### Attributes
 
 - `type`: chooses which flash message to display and also the box style.   The default is `notice`.   `error`, `success` and `info` also have styling.
+- `no-close`: if set, the alert doesn't have a close button
  -->
 <def tag="flash-message" attrs="type">
   <% type = type ? type.to_sym : :notice -%>
-  <div class="alert alert-#{type}" if="&flash[type]" merge-attrs>
-    <a class="close" data-dismiss="alert" href="#" param="close">×</a>
-    <span param="default"><%= flash[type] %></span>
-  </div>
+  <alert-box merge type="&type" if="&flash[type]">
+    <%= flash[type] %>
+  </alert-box>
 </def>

data/taglibs/forms.dryml

@@ -3,14 +3,23 @@
 <!--</def>-->
 
 
+<%# When using field-lists, remember to add the form-horizontal class to get the bootstrap looks (this is done automatically in forms and show-page).
+    <div class="form-horizontal">
+      <field-list class="form-horizontal" with="&Project.first"/>
+    </div>
+%>
 
+<def tag="field-list">
+  <bootstrap-fields merge/>
+</def>
 
+<%# This tag adds the class 'uneditable-input' to a view.   This is very useful with `<bootstrap-fields>`, which is the default `<field-list>` for hobo_bootstrap.  Use like so:
 
 
-
-
-<def tag="field-list">
-  <bootstrap-fields merge/>
+    <field-list class="form-horizontal" tag="uneditable-input">
+%>
+<def tag="uneditable-input">
+  <view merge class="uneditable-input"/>
 </def>
 
 <def tag="bootstrap-fields" attrs="size, columns, tag, no-edit, required, no-blanks">
@@ -27,7 +36,7 @@
     -%>
       <div
          class="control-group #{'required' if required.include?(scope.field_name)}" 
-         unless="&(tag == 'input' && no_edit == 'skip' && !can_edit?) || (tag == 'view' && no_blanks && this.blank?)"
+         unless="&(tag == 'input' && no_edit == 'skip' && !can_edit?) || ((tag == 'view' || tag == 'uneditable-input') && no_blanks && this.blank?)"
          param="#{field_method}-field">
 
         <label class="control-label" for="&id_for_this" param="#{field_method}-label" unless="&field_name.blank?">
@@ -55,14 +64,6 @@
   </old-form:>
 </extend>
 
-
-
-
-
-
-
-
-
 <!--
 Like `<with-fields>`, but groups fields into columns in a bootstrap-friendly fashion.
 
@@ -168,12 +169,12 @@ Supports all attributes supported by `<with-fields>` plus:
 <def tag="one-line-form" attrs="fields">
   <div class="row">
     <div class="span12">
-      <form class="inline-form well" merge-attrs>
+      <form class="inline-form well" remove-class="form-horizontal" merge>
         <field-list: replace>
-          <one-line-field-list fields="&fields"/>
+          <one-line-field-list param="field-list" fields="&fields"/>
         </field-list:>
         <actions: replace>
-          <button class="btn btn-primary" type="submit">
+          <button class="btn btn-primary" type="submit" param="submit">
             +
           </button>
         </actions:>

data/taglibs/index_page.dryml

@@ -3,13 +3,21 @@
   <a with="&this_parent" action="edit">
     <i class="icon icon-edit"></i>
   </a>
-  <%= link_to '<i class=\'icon-trash\'></i>'.html_safe, this_parent, :'data-confirm' => t('hobo.messages.confirm', :default=>'Are you sure?'), method: :delete %>
+  <% if can_delete?(this_parent) %>
+  <%= link_to '<i class=\'icon-trash\'></i>'.html_safe, this_parent, :'data-confirm' => t('hobo.messages.confirm', :default=>'Are you sure?'), :method => :delete %>
+  <% end %>
 </def>
 
 <extend tag="index-page">
-  <old-index-page: merge>
+  <old-index-page: without-count without-top-page-nav merge>
 
-    <new-link: class="btn pull-right"/>
+    <new-link: replace/>    
+    <content-header: class="well"/>
+    <before-heading:>
+      <a action="new" to="&model" param="new-link" class="btn pull-right btn-primary">
+        <ht key="#{model.to_s}.actions.new">New <%= model %></ht>
+      </a>
+    </before-heading:>
 
     <collection: replace>
       <%
@@ -24,7 +32,7 @@
           field_names = field_names.join(', ')
         end
       %>
-      <table class="table table-striped" without-header
+      <table class="table table-striped table-bordered" without-header
         fields="&field_names" param="collection">
         <actions-label:>
           <t key="hobo.messages.actions">Actions</t>

data/taglibs/lifecycle.dryml

@@ -0,0 +1,13 @@
+<!--Add a btn class to transition buttons-->
+
+<def tag="transition-buttons">
+  <% ajax_attrs, html_attrs = attributes.partition_hash(HoboRapidHelper::AJAX_ATTRS) %>
+  <div merge-attrs="&html_attrs" class="transitions">
+    <% transitions = this.lifecycle.publishable_transitions_for(current_user) %>
+    <if test="&transitions">
+      <% transitions.each do |t| %>
+        <transition-button merge-attrs="&ajax_attrs" transition="&t" class="btn"/>
+      <% end %>
+    </if>
+  </div>
+</def>

data/taglibs/show_page.dryml

@@ -1,7 +1,15 @@
 <extend tag="show-page">
   <old-show-page: merge>
     <field-list: class="form-horizontal"/>
-    <edit-link: class="btn pull-right"/>
-    <after-edit-link:><div style="clear: right;"/></after-edit-link:>
+
+    <before-heading:>
+       <a action="edit" if="&can_edit?" param="edit-link" class="btn pull-right">
+        <ht key="#{model.to_s}.actions.edit">Edit <%= model %></ht>
+      </a>
+    </before-heading:>
+    
+    <edit-link: replace/>
+    
+    <content-header: class="well"/>
   </old-show-page:>
 </extend>

data/vendor/assets/stylesheets/hobo_bootstrap.css

@@ -0,0 +1 @@
+//= require_tree './hobo_bootstrap'

data/vendor/assets/stylesheets/{hobo_bootstrap.scss → hobo_bootstrap/hobo_bootstrap_main.scss}

@@ -1,3 +1,4 @@
+
 @import "compass_twitter_bootstrap";
 
 /* Top menu bar (app name, login...): 
@@ -43,6 +44,10 @@ h2.heading{
   margin-bottom:10px;
   line-height:24px;
 }
+.index-page h2.heading{
+  margin-bottom:0px;
+  line-height:26px;
+}
 
 /*  hidden-fields */
 div.hidden-fields {
@@ -82,3 +87,44 @@ li.input-many-template { display:none; }
 
 /* collection */
 ul.collection > li { margin-left: 0; list-style: none;}
+ul.collection { margin-left: 0;}
+
+
+
+/* Show page */
+.show-page .content-body .description{
+  margin-bottom:10px;
+}
+
+
+
+/* Icon URLs */
+[class^="icon-"], [class*=" icon-"] {
+  background-image: url("../glyphicons-halflings.png");
+}
+.icon-white {
+    background-image: url("../glyphicons-halflings-white.png");
+}
+
+
+/* The hidden class is used by Hobo */
+.hidden{
+  display:none;
+}
+
+
+
+/* Field-lists alignment and details*/
+.form-horizontal .control-label {
+  font-weight: bold;
+}
+.form-horizontal .controls {
+  padding-top:5px;
+}
+.form-horizontal input, .form-horizontal textarea, .form-horizontal select, .form-horizontal .help-inline, .form-horizontal .uneditable-input, .form-horizontal .input-prepend, .form-horizontal .input-append {
+  margin-top:-5px;
+}
+.control-group.required .control-label:after {
+  content:"*";
+  color: #C62121; 
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo_bootstrap
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre3
+        version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre3
+        version: 2.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: compass_twitter_bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -109,14 +109,17 @@ files:
 - screenshots/three_columns_complex.png
 - screenshots/top_menu.png
 - screenshots/two_columns.png
+- taglibs/alert_box.dryml
 - taglibs/buttons.dryml
 - taglibs/card.dryml
 - taglibs/delete_button.dryml
 - taglibs/edit_page.dryml
+- taglibs/error_messages.dryml
 - taglibs/flash_message.dryml
 - taglibs/forms.dryml
 - taglibs/hobo_bootstrap.dryml
 - taglibs/index_page.dryml
+- taglibs/lifecycle.dryml
 - taglibs/login.dryml
 - taglibs/nav.dryml
 - taglibs/page.dryml
@@ -127,10 +130,11 @@ files:
 - taglibs/tabs.dryml
 - vendor/assets/images/ajax-loader.gif
 - vendor/assets/javascripts/hobo_bootstrap.js
-- vendor/assets/stylesheets/hobo_bootstrap.scss
-- vendor/assets/stylesheets/hobo_bootstrap_docs.css
-- vendor/assets/stylesheets/hobo_bootstrap_responsive.css
-homepage: https://github.com/suyccom/hobo_bootstrap
+- vendor/assets/stylesheets/hobo_bootstrap.css
+- vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_docs.css
+- vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_main.scss
+- vendor/assets/stylesheets/hobo_bootstrap/hobo_bootstrap_responsive.scss
+homepage: https://github.com/Hobo/hobo_bootstrap
 licenses: []
 post_install_message: 
 rdoc_options: