Skip to content

Commit

Permalink
style added :)
Browse files Browse the repository at this point in the history
  • Loading branch information
marziolek committed Jan 31, 2012
1 parent b5aac1e commit a1666aa
Show file tree
Hide file tree
Showing 26 changed files with 272 additions and 80 deletions.
179 changes: 179 additions & 0 deletions app/assets/stylesheets/style.css
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,179 @@

body {
background-color: #EEE;
color: #333;
font-family: helvetica, verdana, arial, sans-serif;
font-size: 12px;
margin:0;
}

#content {
width:960px;
position: relative;
margin: 0 auto;
min-height: 100%;
height: auto !important;
height: 100%;
z-index:2;
}

footer {
position:relative;
height:80px;
width:100%;
background-color: #EEE;
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EEE), to(#CCC));
background-image: -webkit-linear-gradient(top, #EEE, #CCC);
background-image: -moz-linear-gradient(top, #EEE, #CCC);
background-image: -ms-linear-gradient(top, #EEE, #CCC);
background-image: -o-linear-gradient(top, #EEE, #CCC);
z-index:-2;
}

table {
border-spacing:0;
border-collapse:collapse;
border-image:none;
}

th {
text-align:center;
padding:5px;
}

td {
line-height: 18px;
text-align:center;
border:1px solid #DDD;
margin:0;
padding:5px;
}

td > a {

}

pre {
background-color: #eee;
padding: 10px;
font-size: 11px; }

a {
color:#333;
text-decoration:none;
}

a:hover {
color:darkorange;
text-decoration:underline;
}

div {
&.field, &.actions {
margin-bottom: 10px; } }

#notice {
color: green; }

.field_with_errors {
padding: 2px;
background-color: red;
display: table; }

#error_explanation {
width: 450px;
border: 2px solid red;
padding: 7px;
padding-bottom: 0;
margin-bottom: 20px;
background-color: #f0f0f0;
h2 {
text-align: left;
font-weight: bold;
padding: 5px 5px 5px 15px;
font-size: 12px;
margin: -7px;
margin-bottom: 0px;
background-color: #c00;
color: #fff; }
ul li {
font-size: 12px;
list-style: square; }
}

#top {
width:100%;
height:50px;
background-color:#222;
position:absolute;
top:0;
z-index:-2;
}

#menu a {
font-size:16px;
font-weight:bold;
color:#EEE;
text-transform:uppercase;
padding:22px 10px;
text-decoration:none;
line-height:50px;
}

#menu a:hover {
text-decoration:none;
color:#000;
background-color:orange;
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(orange), to(darkorange));
background-image: -webkit-linear-gradient(top, orange, darkorange);
background-image: -moz-linear-gradient(top, orange, darkorange);
background-image: -ms-linear-gradient(top, orange, darkorange);
background-image: -o-linear-gradient(top, orange, darkorange);
border-bottom-left-radius:6px;
border-bottom-right-radius:6px;
}

#menu {
background-color:#222;
height:50px;
}

a#menu_highlighted {
text-decoration:none;
color:#000;
background-color:orange;
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(orange), to(darkorange));
background-image: -webkit-linear-gradient(top, orange, darkorange);
background-image: -moz-linear-gradient(top, orange, darkorange);
background-image: -ms-linear-gradient(top, orange, darkorange);
background-image: -o-linear-gradient(top, orange, darkorange);

border-bottom-left-radius:6px;
border-bottom-right-radius:6px;
}

a#wyloguj {
clear:both;
float:right;
padding:0;
line-height:20px;
text-transform:none;
font-size:12px;
font-weight:normal;
margin-top:2px;
}

a#wyloguj:hover {
clear:both;
background-color:#222;
background-image:none;
color:darkorange;
text-decoration:underline;
}


h1 {
border-bottom:1px solid #DDD;
padding-left:40px;
}

1 change: 1 addition & 0 deletions app/controllers/application_controller.rb
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,4 @@
#encoding: utf-8
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
protect_from_forgery protect_from_forgery
helper_method :current_user_session, :current_user helper_method :current_user_session, :current_user
Expand Down
1 change: 1 addition & 0 deletions app/controllers/applications_controller.rb
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,4 @@
#encoding: utf-8
class ApplicationsController < ApplicationController class ApplicationsController < ApplicationController
before_filter :authenticate before_filter :authenticate
# GET /applications # GET /applications
Expand Down
1 change: 1 addition & 0 deletions app/controllers/clients_applications_controller.rb
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,4 @@
#encoding: utf-8
class ClientsApplicationsController < ApplicationController class ClientsApplicationsController < ApplicationController
before_filter :authenticate before_filter :authenticate
# GET /clients_applications # GET /clients_applications
Expand Down
1 change: 1 addition & 0 deletions app/controllers/clients_controller.rb
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,4 @@
#encoding: utf-8
class ClientsController < ApplicationController class ClientsController < ApplicationController
before_filter :authenticate before_filter :authenticate
# GET /clients # GET /clients
Expand Down
1 change: 1 addition & 0 deletions app/controllers/contact_people_controller.rb
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,4 @@
#encoding: utf-8
class ContactPeopleController < ApplicationController class ContactPeopleController < ApplicationController
before_filter :authenticate before_filter :authenticate
# GET /contact_people # GET /contact_people
Expand Down
Binary file added app/views/applications/.edit.html.erb.swp
Binary file not shown.
6 changes: 3 additions & 3 deletions app/views/applications/edit.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1>Editing application</h1> <h1>Edytuj aplikację</h1>


<%= render 'form' %> <%= render 'form' %>
<%= link_to 'Show', @application %> | <%= link_to 'Pokaż', @application %> |
<%= link_to 'Back', applications_path %> <%= link_to 'Wstecz', applications_path %>
10 changes: 5 additions & 5 deletions app/views/applications/index.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1>Listing applications</h1> <h1>Aplikacje</h1>


<table> <table>
<tr> <tr>
Expand All @@ -15,13 +15,13 @@
<td><%= application.name %></td> <td><%= application.name %></td>
<td><%= application.description %></td> <td><%= application.description %></td>
<td><%= application.version %></td> <td><%= application.version %></td>
<td><%= link_to 'Show', application %></td> <th><%= link_to 'Pokaż', application %></th>
<td><%= link_to 'Edit', edit_application_path(application) %></td> <th><%= link_to 'Edytuj', edit_application_path(application) %></th>
<td><%= link_to 'Destroy', application, confirm: 'Are you sure?', method: :delete %></td> <th><%= link_to 'Usuń', application, confirm: 'Jesteś pewien?', method: :delete %></th>
</tr> </tr>
<% end %> <% end %>
</table> </table>


<br /> <br />


<%= link_to 'New Application', new_application_path %> <%= link_to 'Dodaj nową aplikację', new_application_path %>
4 changes: 2 additions & 2 deletions app/views/applications/new.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
<h1>New application</h1> <h1>Dodaj nową aplikację</h1>


<%= render 'form' %> <%= render 'form' %>
<%= link_to 'Back', applications_path %> <%= link_to 'Wstecz', applications_path %>
9 changes: 3 additions & 6 deletions app/views/applications/show.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,9 +1,6 @@
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>


<p> <h2><%= @application.name %></h2>
<b>Name:</b>
<%= @application.name %>
</p>


<p> <p>
<b>Description:</b> <b>Description:</b>
Expand All @@ -16,5 +13,5 @@
</p> </p>




<%= link_to 'Edit', edit_application_path(@application) %> | <%= link_to 'Edytuj', edit_application_path(@application) %> |
<%= link_to 'Back', applications_path %> <%= link_to 'Wstecz', applications_path %>
6 changes: 3 additions & 3 deletions app/views/clients/edit.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1>Editing client</h1> <h1>Edytuj klienta</h1>


<%= render 'form' %> <%= render 'form' %>
<%= link_to 'Show', @client %> | <%= link_to 'Pokaż', @client %> |
<%= link_to 'Back', clients_path %> <%= link_to 'Wstecz', clients_path %>
10 changes: 5 additions & 5 deletions app/views/clients/index.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1>Listing clients</h1> <h1>Klienci</h1>


<table> <table>
<tr> <tr>
Expand All @@ -19,13 +19,13 @@
<td><%= client.city %></td> <td><%= client.city %></td>
<td><%= client.postal_code %></td> <td><%= client.postal_code %></td>
<td><%= client.regon %></td> <td><%= client.regon %></td>
<td><%= link_to 'Show', client %></td> <th><%= link_to 'Pokaż', client %></th>
<td><%= link_to 'Edit', edit_client_path(client) %></td> <th><%= link_to 'Edytuj', edit_client_path(client) %></th>
<td><%= link_to 'Destroy', client, confirm: 'Are you sure?', method: :delete %></td> <th><%= link_to 'Usuń', client, confirm: 'Jesteś pewien?', method: :delete %></th>
</tr> </tr>
<% end %> <% end %>
</table> </table>


<br /> <br />


<%= link_to 'New Client', new_client_path %> <%= link_to 'Dodaj nowego klienta', new_client_path %>
4 changes: 2 additions & 2 deletions app/views/clients/new.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
<h1>New client</h1> <h1>Dodaj nowego klienta</h1>


<%= render 'form' %> <%= render 'form' %>
<%= link_to 'Back', clients_path %> <%= link_to 'Wstecz', clients_path %>
9 changes: 3 additions & 6 deletions app/views/clients/show.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,9 +1,6 @@
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>


<p> <h2><%= @client.name %></h2>
<b>Name:</b>
<%= @client.name %>
</p>


<p> <p>
<b>Address:</b> <b>Address:</b>
Expand All @@ -26,5 +23,5 @@
</p> </p>




<%= link_to 'Edit', edit_client_path(@client) %> | <%= link_to 'Edytuj', edit_client_path(@client) %> |
<%= link_to 'Back', clients_path %> <%= link_to 'Wstecz', clients_path %>
6 changes: 3 additions & 3 deletions app/views/clients_applications/edit.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1>Editing clients_application</h1> <h1>Edytuj aplikację klienta</h1>


<%= render 'form' %> <%= render 'form' %>
<%= link_to 'Show', @clients_application %> | <%= link_to 'Pokaż', @clients_application %> |
<%= link_to 'Back', clients_applications_path %> <%= link_to 'Wstecz', clients_applications_path %>
10 changes: 5 additions & 5 deletions app/views/clients_applications/index.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1>Listing clients_applications</h1> <h1>Aplikacje klientów</h1>


<table> <table>
<tr> <tr>
Expand All @@ -19,13 +19,13 @@
<td><%= clients_application.license_type %></td> <td><%= clients_application.license_type %></td>
<td><%= clients_application.number_of_computers %></td> <td><%= clients_application.number_of_computers %></td>
<td><%= clients_application.product_key %></td> <td><%= clients_application.product_key %></td>
<td><%= link_to 'Show', clients_application %></td> <th><%= link_to 'Pokaż', clients_application %></th>
<td><%= link_to 'Edit', edit_clients_application_path(clients_application) %></td> <th><%= link_to 'Edytuj', edit_clients_application_path(clients_application) %></th>
<td><%= link_to 'Destroy', clients_application, confirm: 'Are you sure?', method: :delete %></td> <th><%= link_to 'Usuń', clients_application, confirm: 'Jesteś pewien?', method: :delete %></th>
</tr> </tr>
<% end %> <% end %>
</table> </table>


<br /> <br />


<%= link_to 'New Clients application', new_clients_application_path %> <%= link_to 'Dodaj aplikację klienta', new_clients_application_path %>
4 changes: 2 additions & 2 deletions app/views/clients_applications/new.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
<h1>New clients_application</h1> <h1>Dodaj aplikację klienta</h1>


<%= render 'form' %> <%= render 'form' %>
<%= link_to 'Back', clients_applications_path %> <%= link_to 'Wstecz', clients_applications_path %>
4 changes: 2 additions & 2 deletions app/views/clients_applications/show.html.erb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
</p> </p>




<%= link_to 'Edit', edit_clients_application_path(@clients_application) %> | <%= link_to 'Edytuj', edit_clients_application_path(@clients_application) %> |
<%= link_to 'Back', clients_applications_path %> <%= link_to 'Wstecz', clients_applications_path %>
6 changes: 3 additions & 3 deletions app/views/contact_people/edit.html.erb
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1>Editing contact_person</h1> <h1>Edytuj osobę kontaktową</h1>


<%= render 'form' %> <%= render 'form' %>
<%= link_to 'Show', @contact_person %> | <%= link_to 'Pokaż', @contact_person %> |
<%= link_to 'Back', contact_people_path %> <%= link_to 'Wstecz', contact_people_path %>
Loading

0 comments on commit a1666aa

Please sign in to comment.