gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix all glyphicons

Browse source
This commit is contained in:
Henne Vogelsang 2014-04-14 18:10:38 +02:00
parent 980eb3b831
commit a8179c87e8
3 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/views/layouts/_user_menu.html.haml
View file

@ -1,15 +1,15 @@
%li %li
= link_to(edit_user_registration_path) do = link_to(edit_user_registration_path) do
%i.icon-wrench %span.glyphicon.glyphicon-wrench
Edit Account Edit Account
-if @conference and @conference.id -if @conference and @conference.id
%li %li
= link_to(conference_proposal_index_path(@conference.short_title)) do = link_to(conference_proposal_index_path(@conference.short_title)) do
%i.icon-comment %span.glyphicon.glyphicon-comment
My Submissions My Submissions
%li %li
= link_to(destroy_user_session_path, :method=>'delete') do = link_to(destroy_user_session_path, :method=>'delete') do
%i.icon-minus %span.glyphicon.glyphicon-minus
Sign out Sign out
-if has_role?(current_user, "admin") || has_role?(current_user, "organizer") -if has_role?(current_user, "admin") || has_role?(current_user, "organizer")
%li.divider %li.divider
@ -18,21 +18,21 @@
- @conferences.each do |conference| - @conferences.each do |conference|
%li %li
= link_to(admin_conference_path(conference.short_title)) do = link_to(admin_conference_path(conference.short_title)) do
%i.icon-cog %span.glyphicon.glyphicon-cog
Manage Manage
= conference.short_title = conference.short_title
%li %li
= link_to(new_admin_conference_path) do = link_to(new_admin_conference_path) do
%i.icon-plus %span.glyphicon.glyphicon-plus
New Conference New Conference
%li.divider %li.divider
%li.dropdown-header %li.dropdown-header
People People
%li %li
= link_to(admin_users_path) do = link_to(admin_users_path) do
%i.icon-user %span.glyphicon.glyphicon-user
Users Users
%li %li
= link_to(admin_people_path) do = link_to(admin_people_path) do
%i.icon-star-empty %span.glyphicon.glyphicon-star-empty
People People

8
app/views/proposal/_form.html.haml
View file

@ -26,7 +26,7 @@
%tbody.files %tbody.files
.row-fluid.fileupload-buttonbar .row-fluid.fileupload-buttonbar
.btn.btn-success.fileinput-button .btn.btn-success.fileinput-button
%i.icon-plus.icon-white %span.glyphicon.glyphicon-icon-plus.icon-white
Add files... Add files...
= f.file_field :attachment = f.file_field :attachment
= f.hidden_field :event_id, :value => @event.id = f.hidden_field :event_id, :value => @event.id
@ -72,7 +72,7 @@
</td> </td>
<td class="start">{% if (!o.options.autoUpload) { %} <td class="start">{% if (!o.options.autoUpload) { %}
<button class="btn btn-primary"> <button class="btn btn-primary">
<i class="icon-upload icon-white"></i> <span class="glyphicon glyphicon-upload"></span>
<span>{%=locale.fileupload.start%}</span> <span>{%=locale.fileupload.start%}</span>
</button> </button>
{% } %}</td> {% } %}</td>
@ -81,7 +81,7 @@
{% } %} {% } %}
<td class="cancel">{% if (!i) { %} <td class="cancel">{% if (!i) { %}
<button class="btn btn-warning"> <button class="btn btn-warning">
<i class="icon-ban-circle icon-white"></i> <span class="glyphicon glyphicon-circle"></span>
<span>{%=locale.fileupload.cancel%}</span> <span>{%=locale.fileupload.cancel%}</span>
</button> </button>
{% } %}</td> {% } %}</td>
@ -111,7 +111,7 @@
{% } %} {% } %}
<td class="delete"> <td class="delete">
<button class="btn btn-danger pull-right" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}"> <button class="btn btn-danger pull-right" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}">
<i class="icon-trash icon-white"></i> <span class="glyphicon glyphicon-trash"></i>
<span>{%=locale.fileupload.destroy%}</span> <span>{%=locale.fileupload.destroy%}</span>
</button> </button>
</td> </td>

30
app/views/schedule/index.html.erb
View file

@ -47,30 +47,32 @@
rowspan ="<%= span[room.id] %>" rowspan ="<%= span[room.id] %>"
class="event" role="button" class="event" role="button"
data-href="<%= url_for(conference_proposal_path(@conference.short_title, event[0].id)) %>"> data-href="<%= url_for(conference_proposal_path(@conference.short_title, event[0].id)) %>">
<%- if speaker = event[0].speakers.first %>
<%= image_tag speaker.gravatar_url, :class => "img-circle pull-right",
:alt => speaker.public_name,
:title => speaker.public_name,
:style => "padding:8px;" %>
<%- end %>
<h5> <h5>
<%- if speaker = event[0].speakers.first %> <span class="glyphicon glyphicon-comment"></span>
<%= image_tag speaker.gravatar_url, :class => "img-circle pull-right", :alt => speaker.public_name, :title => speaker.public_name, :style => "padding:8px;" %>
<%- end %>
<span class="schedule-title">
<i class="icon-comment"></i>
<%= event[0].title %> <%= event[0].title %>
</span>
<% unless event[0].subtitle.empty? %> <% unless event[0].subtitle.empty? %>
<span class="schedule-subtitle"> <span class="schedule-subtitle">
<%= event[0].subtitle %> <%= event[0].subtitle %>
</span> <span>
<% end %> <% end %>
</h5>
</span>
<span class="schedule-speaker"> <span class="schedule-speaker">
<i class="icon-user"></i> <span class="glyphicon glyphicon-user"></span>
<%= "#{speaker.first_name} #{speaker.last_name}" %> <%= "#{speaker.first_name} #{speaker.last_name}" %>
</span> </span>
<% if event[0].track%> <% if event[0].track%>
<span class="schedule-track"> <span class="schedule-track">
<i class="icon-road"></i> <span class="glyphicon glyphicon-road"></span>
<span class="label" style="background-color:<%= event[0].track.color if event[0].track %>"><%= event[0].track.name %></span> <span class="label" style="background-color:<%= event[0].track.color if event[0].track %>"><%= event[0].track.name %></span>
</span> </span>
<% end -%> <% end -%>
</h5>
</td> </td>
<% span[room.id] = span[room.id] + 1 %> <% span[room.id] = span[room.id] + 1 %>
<% elsif span[room.id] > 1 %> <% elsif span[room.id] > 1 %>