Skip to content

Commit

Permalink
rozbehnuti uvodni stranky + kompletni html
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Padrta committed Apr 15, 2017
1 parent 59fd277 commit b366414
Show file tree
Hide file tree
Showing 27 changed files with 10,857 additions and 11 deletions.
711 changes: 711 additions & 0 deletions app/assets/images/img/dunecz.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/e1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
734 changes: 734 additions & 0 deletions app/assets/images/img/e2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/e3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/e4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/gg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/maxitrailer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/screen1_mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/screen2_mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/screen3_mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/screen4_mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/screen5_mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/screen6_mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/screen7_mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
711 changes: 711 additions & 0 deletions app/assets/images/img/screen8_mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ def img_from_model(model)

def online_users
@online_users = []
sessions = Session.order('created_at ASC').all
sessions.each do |session|
user = Marshal.load(Base64.decode64(session.data))['user_id']
if user
@online_users << User.find(user)
end
end
# sessions = Session.order('created_at ASC').all
# sessions.each do |session|
# user = Marshal.load(Base64.decode64(session.data))['user_id']
# if user
# @online_users << User.find(user)
# end
# end
@online_users
end

Expand Down
7 changes: 7 additions & 0 deletions app/views/layouts/_imperialni_nastenka.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div class="rh">
Imperialní nástěnka
</div>
<div class="r">
<%#= House.imperium.house_dashboard.html_safe if House.imperium.house_dashboard %>

</div>
2 changes: 1 addition & 1 deletion app/views/layouts/_leve_pole.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
<%# end %>
<%= render 'layouts/narodni_nastenka' %>
<%= render 'layouts/malorodni_nastenka' %>
<%#= render 'layouts/malorodni_nastenka' %>
47 changes: 47 additions & 0 deletions app/views/layouts/_leve_pole_login.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<div class="lh">
Přihlásit se
</div>
<div class="l">
<%= form_tag user_session_path do %>
<li><%= text_field_tag :login, params[:login], :title => "Registrační e-mail nebo Login", :class => "i_email", :placeholder => "Login nebo e-mail" %>
<li><%= password_field_tag :password, nil, :class => "i_key", :title => "Vstupní heslo", :placeholder => "Vaše heslo" %>
<li><%= submit_tag "Vstoupit do hry", :class => "ok2" %>
<% end %>
</div>

<% if Aplikace.zakladani_hracu_povoleno? %>
<div class="lh">
Rychlá registrace
</div>
<div class="l">
<%= form_tag({:controller => 'users', :action => 'create'}) do %>
<li><%= text_field_tag "user[username]", nil, :class => "i_nick", :title => "Login = Přihlašovací údaj. Maximálně je povoleno 19 znaků.", :placeholder => "Login" %>
<li><%= text_field_tag "user[nick]", nil, :class => "i_nick", :title => "Nick = Jméno vaší postavy ve hře Maximálně je povoleno 19 znaků.", :placeholder => "Herní jméno" %>
<li><%= select_tag("user[house_id]", options_for_select(House.registration, {:include_blank => false})) %>
<li><%= text_field_tag "user[email]", nil, :class => "i_email", :title => "Registrační e-mail", :placeholder => "Registrační e-mail" %>
<li><%= password_field_tag "user[password]", nil, :class => "i_key", :title => "Vstupní heslo", :placeholder => "Vaše heslo" %>
<li><%= password_field_tag "user[password_confirmation]", nil, :class => "i_key", :title => "Kontrola vstupního hesla", :placeholder => "Potvrzení 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>
<% end %>


<div class="lh">
Statistiky
</div>
<div class="l">

<li>Aktivních profilů: <%= User.all.count - 1 %>
<li>Online hráčů: <%= online_users.count %>
<li>Denní průměr: 0

<li>Probíhá:

<% if Aplikace.prihlaseni_povoleno? %>
<span class="zelena">Hra je otevřena</span>
<% else %>
<span class="oranzova">Hra uzavřena</span>
<% end %>

</div>
2 changes: 1 addition & 1 deletion app/views/layouts/_lista.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<%= button_to "Odhlasit", :logout %>
<input type="button" value="Nastavení" title="Nastavení prostředí hry, hesla a vašich osobních údajů" onClick="window.location.href = '/zmena_hesla_f'; ">
<% end -%>
<%= button_to "Help", help_path, :title => "Help" %>
<%#= button_to "Help", help_path, :title => "Help" %>
<%= button_to "Facebook", 'http://www.facebook.com/DunaOnline', :title => "Dunaonline.cz na Facebooku", :style => "margin-right: 10px;" %>
<%= button_to "Google+", 'http://plus.google.com/+DunaonlineCz', :title => "Dunaonline.cz na Google+" %>
<%= button_to "DunaCon", 'http://www.klasikon.tleilax.cz/', :title => "Klasikon a DunaCon na Festivvalu Fantazie v Chotěboři" %>
Expand Down
7 changes: 7 additions & 0 deletions app/views/layouts/_narodni_nastenka.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div class="lh">
Národní nástěnka
</div>
<div class="l">
<%#= current_user.house.house_dashboard.html_safe if current_user.house.house_dashboard %>

</div>
5 changes: 5 additions & 0 deletions app/views/layouts/_paticka.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<div class="footer">
DOv4.7.000 |
<a href="http://dunaonline.cz/" target="_blank">dunaonline.cz</a> 2016 - <%= Date.today.strftime('%Y') %> |
<a href="mailto:[email protected]">[email protected]</a>
</div>
13 changes: 13 additions & 0 deletions app/views/layouts/_prave_pole.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<%= render 'layouts/imperialni_nastenka' %>

<div class="rh">
Systémová nástěnka
</div>
<div class="r">
<h3>Testování</h3>
<p><b>Testujeme ekonomickou část, politiku, komunikaci a výzkum.</b></p>

<p>Pro testování je tu Systémové forum. Sledujte překlepy, pravopisné chyby,
nesrovnalosti v designu a nelogičnosti v testovaných větvých vývoje. </p>

</div>
24 changes: 24 additions & 0 deletions app/views/layouts/_prave_pole_login.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<div class="rh">
Systémová nástěnka
</div>
<div class="r">

<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/DunaOnline">Facebooku</a>
anebo
<a href="https://plus.google.com/b/113790847689421917030/113790847689421917030/posts">Google+</a>
.
</div>

<div class="rh">
Odkazy
</div>
<div class="r" style="text-align:center;">

<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>
54 changes: 54 additions & 0 deletions app/views/layouts/_stred_login.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<div class="all" style="padding-top: 15px;">

<i><p>Zatím, co písky pouštní planety Arrakis plynou stále stejným tempem jako dříve, řád Impéria lidí byl obrácen v chaos. Od náhlého úmrtí mocného Imperátora Elrooda IX. Corrino se mnohé změnilo…

<p>Velkorody Atreides a Ekaz potlačili povstání Suboidů na Iksu, přičemž hrabě Dominik Vernio opět usedl na purpurový trůn Verniů z Iks. Imperiální regent sedící po pravici Zlatého trůnu přikázal popravu usvědčeného atentátníka – tvarového tanečníka, který zavraždil korunního prince Shaddama IV. Corrino. Po tomto prohlášení započala blokáda Tleilaxu požadující vydání pánů již zmíněného tvarového tanečníka. Blokády se zúčastnily zbylé Velkorody Landsraadu, jmenovitě Harkonnenové, Moritani a Riches.

<p>Mluvčí pravdy ze sesterstva Bene Gesserit přislíbila svou podporu při následném soudním tribunálu, který se odehraje na oběžné dráze Tleilaxu. Šlechtici věrní rodu Corrino se účastnit odmítli a pod ochranou Sardaukarů se stáhli na dřívější domovskou planetu Corrinů, na zpustošenou Salusu Secundus.

<p>Jeho výsost Imperiální Regent přislíbil, že ochrání Imperiální dvůr a Impérium, než bude zvolen právoplatný Imperátor. Právě v tomto bodě začínají rýsovat příběhy nového Impéria. </i>
<br><a style="float:right">Gilbertus Albans, Deníky nového Impéria</a><br>


</div>

<div class="all" style="padding-top: 15px;">

<h3>Hra je v testovac fázi a otvřena</h3>
<br>
<p>Vážení návštěvníci!

<p>Vítám vás u vstupního portálu do herního světa Duny, jejímž stvořitelem je americký spisovatel Frank Herbert. Ve
své fantasii vytvořil epos o pouštní planetě Arrakis (jinak známé jako Duna) zahrnující vesmír s kvalitou
minimálně na úrovni Tolkienovy Středozemě.

<p>Tyto stránky mají ambici navázat na tradiční českou hru dunaonline.com a to v novém kabátě a s novými možnostmi –
jak pro jednotlivé hráče, tak pro jejich vedení.

<p>Pro členství ve hře se stačí pouze bezplatně zaregistrovat! Jménem admin-týmu vám přeji příjemnou zábavu a hru.


</div>

<table class="tab1">
<tr>
<th>
Screeny ze hry
</th>
</tr>

<tr>
<td style="text-align:center">
<%= image_tag("img/screen1_mini.png", class: "screen", alt: "Screen") %>
<%= image_tag("img/screen2_mini.png", class: "screen", alt: "Screen") %>
<%= image_tag("img/screen3_mini.png", class: "screen", alt: "Screen") %>
<%= image_tag("img/screen4_mini.png", class: "screen", alt: "Screen") %>
<%= image_tag("img/screen5_mini.png", class: "screen", alt: "Screen") %>
<%= image_tag("img/screen6_mini.png", class: "screen", alt: "Screen") %>
<%= image_tag("img/screen7_mini.png", class: "screen", alt: "Screen") %>
<%= image_tag("img/screen8_mini.png", class: "screen", alt: "Screen") %>

</td>
</tr>

</table>
3 changes: 2 additions & 1 deletion config/initializers/session_store.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Be sure to restart your server when you modify this file.

Rails.application.config.session_store :cookie_store, key: '_dune_session'
# Rails.application.config.session_store :cookie_store, key: '_dune_session'
Rails.application.config.session_store :active_record_store
2 changes: 1 addition & 1 deletion db/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

titan = House::Titan.create(name: 'Titans', playable: false, leader: 'The Oraculum of Time')
empire = House::Empire.create(name: 'Empire', playable: false, leader: 'Emperor')
rene = House::Renegat.create(name: 'Renegates', playable: false, leader: '')
rene = House::Renegat.create(name: 'Renegates', playable: false, leader: 'Desperado')
atr = House::Atreides.create(name: 'Atreides', playable: true, leader: 'Duke')
har = House::Harkonnen.create(name: 'Harkonnen', playable: true, leader: 'Baron')
cor = House::Corrino.create(name: 'Corrino', playable: true, leader: 'Padishah')
Expand Down

0 comments on commit b366414

Please sign in to comment.