Skip to content
Browse files

Oprava layoud login

  • Loading branch information...
2 parents d869541 + f6b4770 commit 9a7d07251785c5283e4e0f4a1cf5245dec45e865 @Tar-Gilkaltar Tar-Gilkaltar committed
View
3 app/assets/stylesheets/application.css.erb
@@ -63,8 +63,7 @@ img.screen {
input.i_email {background-image: url(<%= asset_path 'css/email2.png' %>) !important;}
input.i_login {background-image: url(<%= asset_path 'css/adresat.png' %>) !important;}
input.i_nick {background-image: url(<%= asset_path 'css/adresat.png' %>) !important;}
-.i_key {background-image: url(<%= asset_path 'css/key.png' %>) !important;}
-
+input.i_key {background-image: url(<%= asset_path 'css/key.png' %>) !important;}
div.l select{
margin: 7px 2px 5px 2px;
View
2 app/controllers/eods_controller.rb
@@ -62,8 +62,6 @@ def zobraz_eod
order = current_user.eods.where(:date => date).maximum(:order)
end
- puts "********************************\ndate: #{date} order: #{order}\n*******************************"
-
@eods_global = current_user.eods.where(:date => date, :order => order, :field_id => nil).first
@eods_fields = current_user.eods.where(:date => date, :order => order)
if @eods_global && @eods_fields
View
5 app/models/ability.rb
@@ -34,12 +34,13 @@ def initialize(user)
cannot [:update, :delete], Global
can [:read, :update], User
#can [:update], User, :id => user.id
- can [:read], Planet
+ can [:read, :osidlit_pole], Planet
can [:read], House
- can [:read, :update], Field, :user_id => user.id
+ can [:read, :update, :prejmenuj_pole, :postavit_budovu], Field, :user_id => user.id
can [:read, :update], Resource
can [:read, :create], Vote
can [:update], Vote, :elector => user.id
+ can [:zobraz_eod], Eod, :user_id => user.id
if user.emperor?
elsif user.regent?
View
16 app/views/fields/_index_planeta.html.erb
@@ -1,7 +1,7 @@
<tr>
<td class="tdpl" style="background-image: url(<%= asset_path planet.background %>)">
<li><h2><%= link_to planet.name, planet %></h2>
- <li><%= planet.system_name %>
+ <li><%= planet.system_name %> <%= planet.oznaceni %>
<li><%= planet.obsazenost %>
</td>
<td>
@@ -10,6 +10,13 @@
<% end %>
</td>
<td>
+ <li><%= img_populace "Celková kapacita měst" %> 1000000
+ <li><%= img_vyrobky "Celková kapacita výroby" %> 200
+ <li><%= img_kasarna "Celková kapacita kasáren" %> 1000
+ <li><%= img_kosmodrom "Celková kapacita kosmodromů" %> 1000
+ </td>
+
+ <td>
<li><%= img_solary "Výnos soláry" %><font class="<%= trida_barvy(planet.vynos(current_user, 'solar')) %>"><%= format_mena(planet.vynos(current_user, 'solar'), "S") %></font>
<li><%= img_material "Výnos materiál" %><font class="<%= trida_barvy(planet.vynos(current_user, 'material')) %>"><%= format_mena(planet.vynos(current_user, 'material'), "kg") %></font>
<li><%= img_populace "Výnos populace" %><font class="<%= trida_barvy(planet.vynos(current_user, 'population')) %>"><%= format_mena(planet.vynos(current_user, 'population'), "k") %></font>
@@ -17,13 +24,6 @@
</td>
<td>
- <li><img src = "image/cssimage/populace.png" alt="Populace" title="Populace"> 1000000
- <li><img src = "image/cssimage/vyrobky.png" alt="Volná kapacita" title="Výrobky"> 200
- <li><img src = "image/cssimage/Zarmy.png" alt="Kapacita kasaren" title="Kapacita kasaren"> 1000
- <li><img src = "image/cssimage/Zflyt.png" alt="Kapacita kosmodromů" title="Kapacita kosmodromů"> 1000
- </td>
-
- <td>
<% pt = planet.planet_type %>
<li><%= img_solary "Bonus soláry" %><font class="<%= trida_barvy(pt.solar_bonus) %>"><%= format_mena(pt.solar_bonus, "%") %></font>
<li><%= img_material "Bonus materiál" %><font class="<%= trida_barvy(pt.material_bonus) %>"><%= format_mena(pt.material_bonus, "%") %></font>
View
2 app/views/fields/index.html.erb
@@ -13,7 +13,7 @@
<td class="tdpl" style="background-image: url(<%= asset_path @domovska.background %>)">
<li><h2><%= link_to @domovska.name, @domovska %></h2>
<li><%= @domovska.system_name %>
- <li>[23.3]
+ <li><%= @domovska.oznaceni %>
</td>
<td>
View
26 app/views/layouts/_leve_pole_login.html.erb
@@ -4,9 +4,11 @@
<div class="l">
<%= form_tag sessions_path do %>
- <li><%= text_field_tag :login , params[:login], title: "Registrační e-mail nebo Login", class: "i_email" %>
- <li><%= password_field_tag :password , class: "i_key", title: "Vstupní heslo" %>
- <li><%= submit_tag "Vstoupit do hry", class: "ok2" %>
+
+ <li><%= text_field_tag :login , params[:login], :title => "Registrační e-mail nebo Login", :class => "i_email" %>
+ <li><%= password_field_tag :password, nil, :class => "i_key", :title => "Vstupní heslo" %>
+ <li><%= submit_tag "Vstoupit do hry", :class => "ok2" %>
+
<% end %>
</div>
@@ -15,11 +17,18 @@
Rychlá registrace
</div>
<div class="l">
-
- </div>
-
-
+ <%= form_tag({:controller => 'users', :action => 'create'}) do %>
+ <li><%= text_field_tag "user[username]", nil, :class => "i_nick", :title => "Login = Přihlašovací údaj" %>
+ <li><%= text_field_tag "user[nick]", nil, :class => "i_nick", :title => "Nick = Jméno vaší postavy ve hře " %>
+ <li><%= select_tag("user[house_id]", options_for_select(House.playable.all.collect { |p| [p.name, p.id] }, {:include_blank => false})) %>
+ <li><%= text_field_tag "user[email]", nil, :class => "i_email", :title => "Registrační e-mail" %>
+ <li><%= password_field_tag "user[password]", nil, :class => "i_key", :title => "Vstupní heslo"%>
+ <li><%= password_field_tag "user[password_confirmation]", nil, :class => "i_key" , :title => "Kontrola vstupního hesla" %>
+ <li><%= submit_tag "Registrovat se", :class => "ok4", :title => "Rychlá registrace pro nové hráče je zároveň formulářem pro zaslání nového hesla k účtu. Nové heslo vám bude zasláno po vyplnění pole s Registračním e-mailem" %>
+ <% end %>
+ </div>
+
<div class="lh">
Statistiky
</div>
@@ -28,6 +37,7 @@
<li>Aktivních profilů: 0
<li>Online hráčů: 0
<li>Denní průměr: 0
+
<li>Probíhá:
<% if Aplikace.prihlaseni_povoleno? %>
@@ -35,6 +45,6 @@
<% else %>
<font class="oranzova">Hra uzavřena</font>
<% end %>
-
+
</div>
View
4 app/views/layouts/_prave_pole_login.html.erb
@@ -5,7 +5,7 @@
<h3> Hra je uzavřena</h3>
Hra je ve vývoji a proto je uzavřena. Pro více informací navštivte náše profily na
- <a href="http://www.facebook.com/pages/DunaOnline-Emperor/156917794360769">Facebooku</a>
+ <a href="http://www.facebook.com/DunaOnline">Facebooku</a>
anebo
<a href="https://plus.google.com/b/113790847689421917030/113790847689421917030/posts">Google+</a>
.
@@ -18,5 +18,5 @@
<li> <a href="http://goauld-game.cz/" class="no" ><%= image_tag("img/gg.jpg", class: "no", alt: "Goauld Game", title: "Goauld Game") %></a>
<li> <a href="http://encyklopedie.dune.cz/index.htm" class="no"><%= image_tag("img/dunecz.gif", class: "no", alt: "Encyklopedie Duny", title: "Encyklopedie Duny") %></a>
-
+
</div>
View
3 app/views/layouts/_stred_login.html.erb
@@ -18,8 +18,7 @@
Screeny ze hry
</th>
</tr>
-
-
+
<tr>
<td style="text-align:center">
<%= image_tag("img/screen1_mini.png", class: "screen", alt: "Screen") %>
View
7 app/views/planets/show.html.erb
@@ -1,10 +1,17 @@
<% title "Planet" %>
<table class="tab1">
<tr>
+<<<<<<< HEAD
<td class="none" width="190px"></td>
<td class="td1">Informace o planetě</td>
<td class="td1" width="110px">Bonusy planety</td>
<td class="td1" width="110px">Transport</td>
+=======
+ <td class="none" width="180px"></td>
+ <td class="td1">Informace o planetě</td>
+ <td class="td1" width="110px">Bonusy planety</td>
+ <td class="td1" width="100px">Transport</td>
+>>>>>>> f6b4770d4b052c88d96742c72da1f3cb90274aa3
</tr>
<tr>
<td class="tdpl" style="background-image: url(<%= asset_path @planet.background %>)">
View
16 app/views/sessions/new.html.erb
@@ -1,15 +1,7 @@
-<% title "Log in" %>
+<<<<<<< HEAD
<p>Don't have an account? <%= link_to "Sign up!", signup_path %></p>
+=======
+>>>>>>> f6b4770d4b052c88d96742c72da1f3cb90274aa3
-<%= form_tag sessions_path do %>
- <p>
- <%= label_tag :login, "Username or Email Address" %><br />
- <%= text_field_tag :login, params[:login] %>
- </p>
- <p>
- <%= label_tag :password %><br />
- <%= password_field_tag :password %>
- </p>
- <p><%= submit_tag "Log in" %></p>
-<% end %>
+Byl jste přihlášen :)

0 comments on commit 9a7d072

Please sign in to comment.
Something went wrong with that request. Please try again.