Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Puliti i js

  • Loading branch information...
commit 15f617a35250fad97a9ef5bf09e8c774f83a46eb 1 parent 51d2006
@tommyblue authored
View
2  .rvmrc
@@ -1 +1 @@
-rvm use 1.9.3-p125@rubyfatt
+rvm use 1.9.3-p194@rubyfatt
View
1  Gemfile
@@ -24,7 +24,6 @@ gem 'vpim'
gem 'simple_form'
gem 'country_select'
-#gem 'twitter-bootstrap-rails'
gem 'bootstrap-sass', '~> 2.0.2'
# Gems used only for assets and not required
View
7 app/assets/javascripts/application.js
@@ -13,10 +13,13 @@
//= require jquery
//= require jquery_ujs
//= require jquery-ui
-//= require bootstrap
+// require bootstrap
+//= require bootstrap-dropdown
+//= require bootstrap-alert
+//= require bootstrap-transition
//= require tinycon.min
// require_tree .
$(document).ready(function(){
$('input.datepicker').datepicker({ dateFormat: 'dd/mm/yy' });
-})
+})
View
37 app/views/layouts/main.html.erb
@@ -17,6 +17,21 @@
<%= stylesheet_link_tag "application", :media => "all" %>
+ <!-- Javascripts
+ ================================================== -->
+ <%= javascript_include_tag "application" %>
+ <% if I18n.locale == :it %>
+ <%= javascript_include_tag "jquery.ui.datepicker-it" %>
+ <% end %>
+ <script type="text/javascript">
+ $(document).ready(function() {
+ // Modifies the favicon adding the number of expired recurring slips
+ <% expired = expired_recurring_slips_badge(true) %>
+ <% if expired > 0 %>
+ Tinycon.setBubble(<%= expired %>);
+ <% end %>
+ });
+ </script>
</head>
<body>
@@ -36,7 +51,7 @@
</div><!--/span-->
<div class="span9">
<%= content_for?(:breadcrumb) ? yield(:breadcrumb) : render('layouts/breadcrumb') %>
-
+
<% if flash[:info] %>
<div class="alert alert-info fade in" data-alert="alert">
<a class="close" data-dismiss='alert' href="#">×</a>
@@ -78,7 +93,7 @@
<p><%= flash[:success] %></p>
</div>
<% end %>
-
+
<%= yield %>
</div>
</div><!--/row-->
@@ -89,23 +104,5 @@
</footer>
</div> <!-- /container -->
-
- <!-- Javascripts
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <%= javascript_include_tag "application" %>
- <% if I18n.locale == :it %>
- <%= javascript_include_tag "jquery.ui.datepicker-it" %>
- <% end %>
- <script type="text/javascript">
- $(document).ready(function() {
- // Modifies the favicon adding the number of expired recurring slips
- <% expired = expired_recurring_slips_badge(true) %>
- <% if expired > 0 %>
- Tinycon.setBubble(<%= expired %>);
- <% end %>
- });
- </script>
-
</body>
</html>
Please sign in to comment.
Something went wrong with that request. Please try again.