diff --git a/padrino-admin/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt b/padrino-admin/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt index 253d1c9c8..912efae72 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt @@ -12,9 +12,9 @@ html lang='en' xmlns='http://www.w3.org/1999/xhtml' == javascript_include_tag %w[bootstrap/bootstrap-tab bootstrap/bootstrap-popover bootstrap/bootstrap-transition bootstrap/bootstrap-typeahead] body - div class='navbar navbar-fixed' + div class='navbar navbar-fixed-top' div class='navbar-inner' - div class='fluid-container' + div class='container-fluid' == link_to 'Padrino Admin', url(:base_index), :class => 'brand' ul class="nav pull-left" - project_modules.each do |project_module| @@ -24,32 +24,33 @@ html lang='en' xmlns='http://www.w3.org/1999/xhtml' li == link_to 'Profile', url(:accounts, :edit, :id => current_account.id) li == button_to 'Logout', url(:sessions, :destroy), :method => :delete,:class => 'navbar-search' - sidebar = yield_content(:sidebar) - div class="fluid-container" class={'sidebar-left' if sidebar} - - if sidebar - div class="fluid-sidebar" == sidebar - div class='fluid-content '== breadcrumbs settings.breadcrumbs, true - div class="fluid-content" - - [:error, :warning, :success].each do |type| - - next if flash[type].blank? - div id='flash-result' class='#{type}' - h4 = type - == flash[type] + div class="container-fluid" + div class='row-fluid' + - if sidebar + div class="span2" == sidebar + div class={'span10' if sidebar} + == breadcrumbs settings.breadcrumbs, true + - [:error, :warning, :success].each do |type| + - next if flash[type].blank? + div id='flash-result' class='#{type}' + h4 = type + == flash[type] - div id='padrino-modal' class='modal hide fade' - div class="modal-header alert" - a href='#' class='close' data-dismiss='modal' × - h5 id='padrino-modal-title' - div class="modal-body" id='padrino-modal-body' - div class="modal-footer" - a href="#" id='padrino-modal-close' class="btn pull-right" data-dismiss="modal" + div id='padrino-modal' class='modal hide fade' + div class="modal-header alert" + a href='#' class='close' data-dismiss='modal' × + h5 id='padrino-modal-title' + div class="modal-body" id='padrino-modal-body' + div class="modal-footer" + a href="#" id='padrino-modal-close' class="btn pull-right" data-dismiss="modal" - == yield - footer - p class="center-block" - | Copyright © #{Time.now.year} Your Site - - b Powered by Padrino v.#{Padrino.version} - p - == link_to "Padrino web", "http://www.padrinorb.com", :target => :_blank - == link_to "Padrino blog", "http://www.padrinorb.com/blog", :target => :_blank - == link_to "Padrino code", "https://github.com/padrino/padrino-framework", :target => :_blank - == link_to "Padrino twitter", "http://twitter.com/padrinorb", :target => :_blank + == yield + footer + p class="center-block" + | Copyright © #{Time.now.year} Your Site - + b Powered by Padrino v.#{Padrino.version} + p + == link_to "Padrino web", "http://www.padrinorb.com", :target => :_blank + == link_to "Padrino blog", "http://www.padrinorb.com/blog", :target => :_blank + == link_to "Padrino code", "https://github.com/padrino/padrino-framework", :target => :_blank + == link_to "Padrino twitter", "http://twitter.com/padrinorb", :target => :_blank diff --git a/padrino-admin/lib/padrino-admin/generators/templates/slim/page/_form.slim.tt b/padrino-admin/lib/padrino-admin/generators/templates/slim/page/_form.slim.tt index afe506aff..71920872f 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/slim/page/_form.slim.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/slim/page/_form.slim.tt @@ -9,8 +9,8 @@ fieldset class='control-group' <%- end -%> div class="actions" - == f.submit t_admin(:save), :class => 'btn primary' + == f.submit t_admin(:save), :class => 'btn btn-primary' |  - == f.submit t_admin(:save_and_continue), :class => 'btn primary', :name => 'save_and_continue' + == f.submit t_admin(:save_and_continue), :class => 'btn btn-primary', :name => 'save_and_continue' |  - == f.submit t_admin(:cancel), :onclick => "window.location='#{url(:<%= @orm.name_plural %>, :index)}';return false", :class => 'btn default' + == f.submit t_admin(:cancel), :onclick => "window.location='#{url(:<%= @orm.name_plural %>, :index)}';return false", :class => 'btn' diff --git a/padrino-admin/lib/padrino-admin/generators/templates/slim/page/edit.slim.tt b/padrino-admin/lib/padrino-admin/generators/templates/slim/page/edit.slim.tt index c8cfde08e..4b6a24754 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/slim/page/edit.slim.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/slim/page/edit.slim.tt @@ -1,6 +1,6 @@ h2 #{t_admin(:all)} #{t_model(:<%= @orm.name_singular %>)} -ul class="nav tabs" +ul class="nav nav-tabs" li == link_to t_admin(:list), url(:<%= @orm.name_plural %>, :index) li == link_to t_admin(:new), url(:<%= @orm.name_plural %>, :new) li class="active" == link_to t_admin(:edit), url(:<%= @orm.name_plural %>, :edit, :id => @<%= @orm.name_singular %>.id) diff --git a/padrino-admin/lib/padrino-admin/generators/templates/slim/page/index.slim.tt b/padrino-admin/lib/padrino-admin/generators/templates/slim/page/index.slim.tt index 3731afa05..1d9473895 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/slim/page/index.slim.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/slim/page/index.slim.tt @@ -1,6 +1,6 @@ h2 #{t_admin(:all)} #{t_model(:<%= @orm.name_singular %>)} -ul class="nav tabs" +ul class="nav nav-tabs" li class="active" == link_to t_admin(:list), url(:<%= @orm.name_plural %>, :index) li == link_to t_admin(:new), url(:<%= @orm.name_plural %>, :new) @@ -25,6 +25,6 @@ div class="tabs-content" <%- end -%> <%- end -%> td class="action" - == button_to(:edit, url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id),:method => :get, :class => 'pull-left' ) { submit_tag t_admin(:edit), :class =>'btn primary' } - == button_to(:delete, url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id),:method => :delete, :class => "hide #{:<%= @orm.name_plural %>}-#{:destroy}-#{<%= @orm.name_singular %>.id}", "data-title"=>"#{pat(:confirm)}", "data-form" => "#{:<%= @orm.name_plural %>}-#{:destroy}-#{<%= @orm.name_singular %>.id}") { submit_tag t_admin(:delete), :class =>'btn danger pull-left' } - == submit_tag t_admin(:delete), :class =>'btn_delete btn danger pull-left',"data-form" => "#{:<%= @orm.name_plural %>}-#{:destroy}-#{<%= @orm.name_singular %>.id}", "data-cancel" => "#{t_admin(:cancel)}" + == button_to(:edit, url(:<%= @orm.name_plural %>, :edit, :id => <%= @orm.name_singular %>.id),:method => :get, :class => 'pull-left' ) { submit_tag t_admin(:edit), :class =>'btn btn-primary' } + == button_to(:delete, url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id),:method => :delete, :class => "hide #{:<%= @orm.name_plural %>}-#{:destroy}-#{<%= @orm.name_singular %>.id}", "data-title"=>"#{pat(:confirm)}", "data-form" => "#{:<%= @orm.name_plural %>}-#{:destroy}-#{<%= @orm.name_singular %>.id}") { submit_tag t_admin(:delete), :class =>'btn btn-danger pull-left' } + == submit_tag t_admin(:delete), :class =>'btn_delete btn btn-danger pull-left',"data-form" => "#{:<%= @orm.name_plural %>}-#{:destroy}-#{<%= @orm.name_singular %>.id}", "data-cancel" => "#{t_admin(:cancel)}" diff --git a/padrino-admin/lib/padrino-admin/generators/templates/slim/page/new.slim.tt b/padrino-admin/lib/padrino-admin/generators/templates/slim/page/new.slim.tt index 313b9192e..0fbf6fde7 100644 --- a/padrino-admin/lib/padrino-admin/generators/templates/slim/page/new.slim.tt +++ b/padrino-admin/lib/padrino-admin/generators/templates/slim/page/new.slim.tt @@ -1,6 +1,6 @@ h2 #{t_admin(:all)} #{t_model(:<%= @orm.name_singular %>)} -ul class="nav tabs" +ul class="nav nav-tabs" li == link_to t_admin(:list), url(:<%= @orm.name_plural %>, :index) li class="active" == link_to t_admin(:new), url(:<%= @orm.name_plural %>, :new)