Browse files

prior deployment

  • Loading branch information...
1 parent 2e99333 commit df8597fbf63e2b935e42cbbe19b1ecb2ab7c371d @itmeze committed Oct 29, 2011
View
3 app/assets/javascripts/admin.js.coffee
@@ -11,9 +11,10 @@ jQuery ->
-> EJ.setWatermarks()
)
- $('form#search')
+ $('form#new_search_conditions')
.bind("ajax:success", (event, data, status, xhr) ->
$('#search-response').html(data)
)
$.datepicker.setDefaults( $.datepicker.regional[ "pl" ] )
$('.datepicker').datepicker()
+ $('form#new_search_conditions').submit()
View
4 app/assets/stylesheets/styles.css.erb
@@ -107,13 +107,13 @@ input::-webkit-input-placeholder, input:-moz-placeholder {
font-style: italic;
}
table.admin{margin:auto; padding:1px; border:solid; border-width:1px; border-color:#CCC}
-table.admin th {background-color:#567ff6; width:200px; text-align:center; color:#FFF; font-size:14px; font-weight:normal; padding:2px }
+table.admin th {background-color:#567ff6; width:160px; text-align:center; color:#FFF; font-size:14px; font-weight:normal; padding:2px }
table.admin th.male {width:100px}
table.admin td {text-align:center; border:solid; border-width:1px;border-color:#CCC }
tr.parzysty {background-color:#EFF1FE}
input.szukaj {width:200px}
input.data {width:150px}
-div.inline{ height:30px; margin-top:4px; padding:6px;}
+div.inline{ margin-top:4px; padding:6px;}
img.search {width:24px; height:24px; padding-right:6px}
a.details {
background-image: url(<%= asset_path 'view-details-icons.png' %>);
View
3 app/controllers/application_controller.rb
@@ -11,6 +11,7 @@ def hidden_field_valid?
end
def captcha_valid?(model)
- return MyConfiguration.display_captcha || verify_recaptcha(:model => model, :message => "Niewłaściwie przepisany kod! Przepisz ponownie, pamietaj o ponownym załączeniu plików!", :attribute => 'recaptcha')
+ return true unless MyConfiguration.display_captcha
+ return verify_recaptcha(:model => model, :message => "Niewłaściwie przepisany kod! Przepisz ponownie, pamietaj o ponownym załączeniu plików!", :attribute => 'recaptcha')
end
end
View
6 app/controllers/home_controller.rb
@@ -21,7 +21,7 @@ def submit_order
return render 'order' unless hidden_field_valid?
- if captcha_valid? @order && @order.save
+ if captcha_valid?(@order) && @order.save
fork do
Notifications.order(@order).deliver
end
@@ -42,7 +42,7 @@ def submit_guarantee_report
return render 'report' unless hidden_field_valid?
- if captcha_valid? @report && @report.save
+ if captcha_valid?(@report) && @report.save
fork do
Notifications.guarantee_report(@report).deliver
end
@@ -57,7 +57,7 @@ def submit_postguarantee_report
@report_type = false
return render 'report' unless hidden_field_valid?
- if captcha_valid? @report && @report.save
+ if captcha_valid?(@report) && @report.save
fork do
Notifications.postguarantee_report(@report).deliver
end
View
2 app/views/admin/details.html.erb
@@ -1,7 +1,7 @@
<% if @element.nil? %>
<p>Nie znaleziono żadnego elementu</p>
<% else %>
- <div class="szczegoly"></div>
+ <div class="szczegoly"></div>
<%= form_tag :action => 'add_comment', :controller => 'admin', :type => @element.simple_type, :id => @element.id do %>
<table class="szczegoly">
<th colspan="2"><%= @element.type_to_s %> <%= @element.created_at.strftime '%d.%m.%Y' %></th>
View
6 app/views/admin/index.html.erb
@@ -1,5 +1,5 @@
<div class="inline">
- <%= form_for @query, :url => { :action => 'search' }, :remote => true, :id => 'search' do |f| %>
+ <%= form_for @query, :url => { :action => 'search' }, :remote => true do |f| %>
<div class="left ">
<table>
<tbody>
@@ -20,15 +20,13 @@
</div>
<div class="clearfix"></div>
- Pokaż Zgłoszenia od dnia: <%= f.text_field :from, :class => 'data watermark datepicker', :'-data-watermark' => "od dnia" %> do dnia: <%= f.text_field :to, :class => 'data watermark datepicker', :'-data-watermark' => "do dnia" %>
+ Pokaż zgłoszenia od dnia: <%= f.text_field :from, :class => 'data watermark datepicker', :'-data-watermark' => "od dnia" %> do dnia: <%= f.text_field :to, :class => 'data watermark datepicker', :'-data-watermark' => "do dnia" %>
<div class="clearfix"></div>
<input type="submit" value="WYŚWIETL" />
<% end %>
</div>
<div class="clearfix"></div>
-<br/>
-<br/>
<div id="search-response">
</div>
View
5 app/views/admin/search.html.erb
@@ -1,4 +1,8 @@
+<p>
+ Wyświetlane do 30 ostatnich rekordów
+</p>
<table class="admin">
+ <th>TYP</th>
<th>DATA ZGŁOSZENIA</th>
<th>IMIĘ i NAZWISKO</th>
<th>ADRES</th>
@@ -8,6 +12,7 @@
<th class="male">USUŃ REKORD</th>
<% @elements.each_with_index do |e, i| %>
<tr class="<%= i % 2 == 0 ? 'parzysty' : '' %>">
+ <td><%= e.type_to_s %></td>
<td><%= e.created_at.strftime('%d.%m.%Y') %></td>
<td><%= e.name %></td>
<td><%= e.address %></td>
View
6 config/environments/development.rb
@@ -29,13 +29,13 @@
config.action_mailer.smtp_settings = {
:address => "smtp.gmail.com",
:port => 587,
- :user_name => 'XXX',
- :password => 'XXX',
+ :user_name => 'michal.zygula@gmail.com',
+ :password => 'Guatemala2012',
:authentication => 'plain',
:enable_starttls_auto => true }
config.after_initialize do
- MyConfiguration.mailer_to = 'XXX'
+ MyConfiguration.mailer_to = 'marcelina.a@gmail.com'
MyConfiguration.display_spam_hidden_field = true
MyConfiguration.spam_hidden_field_name = 'user_nick'
MyConfiguration.display_captcha = false
View
BIN public/uploads/order/image1/28/aniaimiro_01.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/uploads/order/image2/28/aniaimiro_02.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/uploads/order/image3/28/aniaimiro_03.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/uploads/postguaranteereport/image1/7/aniaimiro_01.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/uploads/postguaranteereport/image2/7/aniaimiro_02.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN public/uploads/postguaranteereport/image3/7/aniaimiro_03.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit df8597f

Please sign in to comment.