the_role 1.6.7 → 1.6.8

data/app/controllers/admin/role_sections_controller.rb

@@ -1,4 +1,6 @@
 class Admin::RoleSectionsController < ApplicationController
+  include TheRole::Requires
+
   layout 'the_role'
 
   before_filter :login_required

data/app/controllers/admin/roles_controller.rb

@@ -1,4 +1,5 @@
 class Admin::RolesController < ApplicationController
+  include TheRole::Requires
   layout 'the_role'
 
   before_filter :login_required

data/config/locales/es.yml

@@ -1,42 +1,42 @@
 es:
   the_role:
-    role_created: El papel de la establecida
-    role_updated: El papel de la actualización
-    role_deleted: El papel de la eliminada
-    section_created: Sección establecida
-    section_not_created: Sección no se crea
-    section_rule_created: La regla fue creada
-    section_rule_not_created: La regla no se crea
-    section_rule_on: Regla de acceso incluye
-    section_rule_off: Acceso para discapacitados Regla
-    state_not_changed: Las reglas del estado no se modifican
-    section_deleted: una sección eliminada
-    section_not_deleted: Esta sección no se quita
-    section_rule_deleted: La regla se retira
-    section_rule_not_deleted: La regla se retira
+    role_created: Establecer el rol
+    role_updated: Actualizar el rol
+    role_deleted: Eliminar el rol
+    section_created: Crear sección
+    section_not_created: Sección no creada
+    section_rule_created: Sección de roles creado
+    section_rule_not_created: Sección de roles no creado
+    section_rule_on: Rol de acceso incluye
+    section_rule_off: Deshabilitar el rol
+    state_not_changed: Rol de estado no se ha modificado
+    section_deleted: sección eliminada
+    section_not_deleted: Sección no se ha sido eliminada
+    section_rule_deleted: Regla eliminada
+    section_rule_not_deleted: Regla no ha sido eliminada
 
   admin:
     roles:
       new:
-        create: Crear un nuevo papel
-        name: El nombre de la función (una cadena de caracteres latinos + subrayado)
-        title: el papel del título
-        description: El papel de la
+        create: Crear un nuevo rol
+        name: El nombre de la función (una cadena de caracteres simples + subrayado)
+        title: título del rol
+        description: Descripción del rol
       role:
         role_name: 'Nombre del rol'
         title: 'Título'
         role_description: 'Descripción'
-        delete_section: Suprimir sección
-        section_delete_confirm: "¿Quiere borrar la partición?"
+        delete_section: Eliminar sección
+        section_delete_confirm: "¿Quiere borrar la sección?"
         rule_delete_confirm: "¿Quieres eliminar una regla?"
         enable: Habilitar
-        disable: Desactiva
-        delete_rule: Eliminar una regla
+        disable: Desactivar
+        delete_rule: Eliminar regla
         new_section_placeholder: Nombre de un nuevo tema
-        create_section: Crear una partición
-        new_rule_placeholder: El nombre de la nueva norma
+        create_section: "Crear una sección"
+        new_rule_placeholder: El nombre de la nueva regla
         create_rule: Nueva regla
       sidebar:
         roles_list: Lista de funciones
-        new_role: Crear una nueva praivlo
-        delete_role_confirm: "Retire el papel? Puede ser peligroso! ¿Está seguro?"
+        new_role: Crear nuevo rol
+        delete_role_confirm: "Quitar el rol? Puede ser peligroso! ¿Está seguro?"

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "1.6.7"
+  VERSION = "1.6.8"
 end

data/lib/the_role.rb

@@ -1,6 +1,4 @@
 require 'haml'
-require 'sass'
-require 'less-rails'
 
 require 'the_role/param_helper'
 require 'the_role/hash'

data/the_role.gemspec

@@ -19,10 +19,4 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency 'haml'
-  s.add_dependency 'sass'
-  s.add_dependency 'sass-rails'
-  s.add_dependency 'coffee-rails'
-  # less for tw bootstrap 
-  s.add_dependency 'therubyracer'
-  s.add_dependency 'less-rails'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &6144180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,62 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6144180
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &6143740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *6143740
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: &6143300 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *6143300
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: &6142860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *6142860
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: &6142420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *6142420
-- !ruby/object:Gem::Dependency
-  name: less-rails
-  requirement: &6141900 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *6141900
 description: Authorization lib for Rails 3 with Web Interface, aka CanCan killer
 email:
 - zykin-ilya@ya.ru
@@ -95,23 +45,10 @@ files:
 - app/assets/javascripts/bootstrap-alert.js
 - app/assets/javascripts/bootstrap-dropdown.js
 - app/assets/stylesheets/admin_the_role.css
-- app/assets/stylesheets/alerts.less
-- app/assets/stylesheets/button-groups.less
-- app/assets/stylesheets/buttons.less
-- app/assets/stylesheets/close.less
-- app/assets/stylesheets/custom.scss
-- app/assets/stylesheets/dropdowns.less
-- app/assets/stylesheets/forms.less
-- app/assets/stylesheets/grid.less
-- app/assets/stylesheets/headers.scss
-- app/assets/stylesheets/layouts.less
-- app/assets/stylesheets/mix.scss
-- app/assets/stylesheets/mixins.less
+- app/assets/stylesheets/custom.css
+- app/assets/stylesheets/headers.css
 - app/assets/stylesheets/reset.css
-- app/assets/stylesheets/role_set.less
-- app/assets/stylesheets/scaffolding.less
-- app/assets/stylesheets/variables.less
-- app/assets/stylesheets/wells.less
+- app/assets/stylesheets/role_base.css
 - app/controllers/admin/role_sections_controller.rb
 - app/controllers/admin/roles_controller.rb
 - app/views/admin/roles/_form.haml
@@ -159,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: the_role
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Authorization lib for Rails 3 with Web Interface, aka CanCan killer

data/app/assets/stylesheets/alerts.less

@@ -1,58 +0,0 @@
-// ALERT STYLES
-// ------------
-
-// Base alert styles
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: @baseLineHeight;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  background-color: @warningBackground;
-  border: 1px solid @warningBorder;
-  .border-radius(4px);
-  color: @warningText;
-}
-.alert-heading {
-  color: inherit;
-}
-
-// Adjust close link position
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: 18px;
-}
-
-// Alternate styles
-// ----------------
-
-.alert-success {
-  background-color: @successBackground;
-  border-color: @successBorder;  
-  color: @successText;
-}
-.alert-danger,
-.alert-error {
-  background-color: @errorBackground;
-  border-color: @errorBorder;
-  color: @errorText;
-}
-.alert-info {
-  background-color: @infoBackground;
-  border-color: @infoBorder;
-  color: @infoText;
-}
-
-// Block alerts
-// ------------------------
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
-}

data/app/assets/stylesheets/button-groups.less

@@ -1,191 +0,0 @@
-// BUTTON GROUPS
-// -------------
-
-
-// Make the div behave like a button
-.btn-group {
-  position: relative;
-  .clearfix(); // clears the floated buttons
-  .ie7-restore-left-whitespace();
-}
-
-// Space out series of button groups
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-
-// Optional: Group multiple button groups together for a toolbar
-.btn-toolbar {
-  margin-top: @baseLineHeight / 2;
-  margin-bottom: @baseLineHeight / 2;
-  .btn-group {
-    display: inline-block;
-    .ie7-inline-block();
-  }
-}
-
-// Float them, remove border radius, then re-add to first and last elements
-.btn-group > .btn {
-  position: relative;
-  float: left;
-  margin-left: -1px;
-  .border-radius(0);
-}
-// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
-.btn-group > .btn:first-child {
-  margin-left: 0;
-     -webkit-border-top-left-radius: 4px;
-         -moz-border-radius-topleft: 4px;
-             border-top-left-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-      -moz-border-radius-bottomleft: 4px;
-          border-bottom-left-radius: 4px;
-}
-// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-     -webkit-border-top-right-radius: 4px;
-         -moz-border-radius-topright: 4px;
-             border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-      -moz-border-radius-bottomright: 4px;
-          border-bottom-right-radius: 4px;
-}
-// Reset corners for large buttons
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-     -webkit-border-top-left-radius: 6px;
-         -moz-border-radius-topleft: 6px;
-             border-top-left-radius: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-      -moz-border-radius-bottomleft: 6px;
-          border-bottom-left-radius: 6px;
-}
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-     -webkit-border-top-right-radius: 6px;
-         -moz-border-radius-topright: 6px;
-             border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-      -moz-border-radius-bottomright: 6px;
-          border-bottom-right-radius: 6px;
-}
-
-// On hover/focus/active, bring the proper btn to front
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
-}
-
-// On active and open, don't show outline
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-
-
-
-// Split button dropdowns
-// ----------------------
-
-// Give the line between buttons some depth
-.btn-group > .dropdown-toggle {
-  padding-left: 8px;
-  padding-right: 8px;
-  .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-  *padding-top: 4px;
-  *padding-bottom: 4px;
-}
-.btn-group > .btn-mini.dropdown-toggle {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-.btn-group > .btn-small.dropdown-toggle {
-  *padding-top: 4px;
-  *padding-bottom: 4px;
-}
-.btn-group > .btn-large.dropdown-toggle {
-  padding-left: 12px;
-  padding-right: 12px;
-}
-
-.btn-group.open {
-
-  // The clickable button for toggling the menu
-  // Remove the gradient and set the same inset shadow as the :active state
-  .dropdown-toggle {
-    background-image: none;
-    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-  }
-
-  // Keep the hover's background when dropdown is open
-  .btn.dropdown-toggle {
-    background-color: @btnBackgroundHighlight;
-  }
-  .btn-primary.dropdown-toggle {
-    background-color: @btnPrimaryBackgroundHighlight;
-  }
-  .btn-warning.dropdown-toggle {
-    background-color: @btnWarningBackgroundHighlight;
-  }
-  .btn-danger.dropdown-toggle {
-    background-color: @btnDangerBackgroundHighlight;
-  }
-  .btn-success.dropdown-toggle {
-    background-color: @btnSuccessBackgroundHighlight;
-  }
-  .btn-info.dropdown-toggle {
-    background-color: @btnInfoBackgroundHighlight;
-  }
-  .btn-inverse.dropdown-toggle {
-    background-color: @btnInverseBackgroundHighlight;
-  }
-}
-
-
-// Reposition the caret
-.btn .caret {
-  margin-top: 7px;
-  margin-left: 0;
-}
-.btn:hover .caret,
-.open.btn-group .caret {
-  .opacity(100);
-}
-// Carets in other button sizes
-.btn-mini .caret {
-  margin-top: 5px;
-}
-.btn-small .caret {
-  margin-top: 6px;
-}
-.btn-large .caret {
-  margin-top: 6px;
-  border-left-width:  5px;
-  border-right-width: 5px;
-  border-top-width:   5px;
-}
-// Upside down carets for .dropup
-.dropup .btn-large .caret {
-  border-bottom: 5px solid @black;
-  border-top: 0;
-}
-
-
-
-// Account for other colors
-.btn-primary,
-.btn-warning,
-.btn-danger,
-.btn-info,
-.btn-success,
-.btn-inverse {
-  .caret {
-    border-top-color: @white;
-    border-bottom-color: @white;
-    .opacity(75);
-  }
-}
-

data/app/assets/stylesheets/buttons.less

@@ -1,191 +0,0 @@
-// BUTTON STYLES
-// -------------
-
-
-// Base styles
-// --------------------------------------------------
-
-// Core
-.btn {
-  display: inline-block;
-  .ie7-inline-block();
-  padding: 4px 10px 4px;
-  margin-bottom: 0; // For input.btn
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
-  *line-height: 20px;
-  color: @grayDark;
-  text-align: center;
-  text-shadow: 0 1px 1px rgba(255,255,255,.75);
-  vertical-align: middle;
-  cursor: pointer;
-  .buttonBackground(@btnBackground, @btnBackgroundHighlight);
-  border: 1px solid @btnBorder;
-  *border: 0; // Remove the border to prevent IE7's black border on input:focus
-  border-bottom-color: darken(@btnBorder, 10%);
-  .border-radius(4px);
-  .ie7-restore-left-whitespace(); // Give IE7 some love
-  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-}
-
-// Hover state
-.btn:hover {
-  color: @grayDark;
-  text-decoration: none;
-  background-color: darken(@white, 10%);
-  *background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
-  background-position: 0 -15px;
-
-  // transition is only when going to hover, otherwise the background
-  // behind the gradient (there for IE<=9 fallback) gets mismatched
-  .transition(background-position .1s linear);
-}
-
-// Focus state for keyboard and accessibility
-.btn:focus {
-  .tab-focus();
-}
-
-// Active state
-.btn.active,
-.btn:active {
-  background-color: darken(@white, 10%);
-  background-color: darken(@white, 15%) e("\9");
-  background-image: none;
-  outline: 0;
-  .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-}
-
-// Disabled state
-.btn.disabled,
-.btn[disabled] {
-  cursor: default;
-  background-color: darken(@white, 10%);
-  background-image: none;
-  .opacity(65);
-  .box-shadow(none);
-}
-
-
-// Button Sizes
-// --------------------------------------------------
-
-// Large
-.btn-large {
-  padding: 9px 14px;
-  font-size: @baseFontSize + 2px;
-  line-height: normal;
-  .border-radius(5px);
-}
-.btn-large [class^="icon-"] {
-  margin-top: 1px;
-}
-
-// Small
-.btn-small {
-  padding: 5px 9px;
-  font-size: @baseFontSize - 2px;
-  line-height: @baseLineHeight - 2px;
-}
-.btn-small [class^="icon-"] {
-  margin-top: -1px;
-}
-
-// Mini
-.btn-mini {
-  padding: 2px 6px;
-  font-size: @baseFontSize - 2px;
-  line-height: @baseLineHeight - 4px;
-}
-
-
-// Alternate buttons
-// --------------------------------------------------
-
-// Set text color
-// -------------------------
-.btn-primary,
-.btn-primary:hover,
-.btn-warning,
-.btn-warning:hover,
-.btn-danger,
-.btn-danger:hover,
-.btn-success,
-.btn-success:hover,
-.btn-info,
-.btn-info:hover,
-.btn-inverse,
-.btn-inverse:hover {
-  color: @white;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-}
-// Provide *some* extra contrast for those who can get it
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active {
-  color: rgba(255,255,255,.75);
-}
-
-// Set the backgrounds
-// -------------------------
-.btn {
-  // reset here as of 2.0.3 due to Recess property order
-  border-color: #ccc;
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);
-}
-.btn-primary {
-  .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
-}
-// Warning appears are orange
-.btn-warning {
-  .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight);
-}
-// Danger and error appear as red
-.btn-danger {
-  .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight);
-}
-// Success appears as green
-.btn-success {
-  .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
-}
-// Info appears as a neutral blue
-.btn-info {
-  .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight);
-}
-// Inverse appears as dark gray
-.btn-inverse {
-  .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight);
-}
-
-
-// Cross-browser Jank
-// --------------------------------------------------
-
-button.btn,
-input[type="submit"].btn {
-
-  // Firefox 3.6 only I believe
-  &::-moz-focus-inner {
-    padding: 0;
-    border: 0;
-  }
-
-  // IE7 has some default padding on button controls
-  *padding-top: 2px;
-  *padding-bottom: 2px;
-  &.btn-large {
-    *padding-top: 7px;
-    *padding-bottom: 7px;
-  }
-  &.btn-small {
-    *padding-top: 3px;
-    *padding-bottom: 3px;
-  }
-  &.btn-mini {
-    *padding-top: 1px;
-    *padding-bottom: 1px;
-  }
-}

data/app/assets/stylesheets/close.less

@@ -1,29 +0,0 @@
-// CLOSE ICONS
-// -----------
-
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: @baseLineHeight;
-  color: @black;
-  text-shadow: 0 1px 0 rgba(255,255,255,1);
-  .opacity(20);
-  &:hover {
-    color: @black;
-    text-decoration: none;
-    cursor: pointer;
-    .opacity(40);
-  }
-}
-
-// Additional properties for button version
-// iOS requires the button element instead of an anchor tag.
-// If you want the anchor version, it requires `href="#"`.
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-}