Skip to content

Commit

Permalink
[webui] simplify header setup so the breadcrump is not jumping
Browse files Browse the repository at this point in the history
  • Loading branch information
coolo committed Oct 8, 2012
1 parent 80068c0 commit 8f0b48d
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 12 deletions.
File renamed without changes
6 changes: 6 additions & 0 deletions src/webui/app/assets/stylesheets/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -390,3 +390,9 @@ $icons-sprite-dimensions:true;
background: sprite($icons-sprites, note_delete) no-repeat !important;
@include sprite-dimensions($icons-sprites, note_delete);
}

#breadcrump .icons-home_grey {
float: left;
margin-right: 5px;
}

2 changes: 1 addition & 1 deletion src/webui/app/views/layouts/_watch_and_search.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<%= form_tag({:controller => 'search', :action => 'search'}, {:method => :post, :id => "global-search-form", :class => "label-overlay"}) do -%>
<div style="display: inline">
<label for="search">Search</label>
<label for="search" class="hidden">Search</label>
<%= text_field_tag 'search_text', '', :id => 'search'-%>
<input type="submit" value="Search" class="hidden" />
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/webui/app/views/main/_feeds.html.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="box box-shadow">
<h2 class="box-header">Feeds</h2>
<ul class="feedbox">
<li><%= image_tag('feeds.png') %> <%= link_to 'Commits in openSUSE:Factory', 'https://hermes.opensuse.org/feeds/25549.rdf' %></li>
<li><%= image_tag('feeds.png') %> <%= link_to 'New projects created', 'https://hermes.opensuse.org/feeds/25546.rdf' %></li>
<li><%= image_tag('feeds.png') %> <%= link_to 'New packages created', 'https://hermes.opensuse.org/feeds/25545.rdf' %></li>
<li><%= sprite_tag('feeds') + link_to('Commits in openSUSE:Factory', 'https://hermes.opensuse.org/feeds/25549.rdf') %></li>
<li><%= sprite_tag('feeds') + link_to('New projects created', 'https://hermes.opensuse.org/feeds/25546.rdf') %></li>
<li><%= sprite_tag('feeds') + link_to('New packages created', 'https://hermes.opensuse.org/feeds/25545.rdf') %></li>
</ul>
</div>
2 changes: 1 addition & 1 deletion src/webui/app/views/main/_latest_updates.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="box box-shadow">
<h2 class="box-header">
Latest Updates
<%= link_to(image_tag('feeds.png', :title => 'RSS Feed', :class => 'alignright'), :action => 'latest_updates', :format => 'rss') %>
<%= link_to('', { :action => 'latest_updates', :format => 'rss'}, { class: "alignright icons-feeds", title: "RSS Feed" }) %>
</h2>
<table>
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion src/webui/app/views/main/_news.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="box box-shadow">
<h2 class="box-header">
News
<%= link_to('', { :title => 'RSS Feed', :action => 'news', :format => 'rss'}, { class: 'alignright icons-feeds' }) %>
<%= link_to('', { :action => 'news', :format => 'rss'}, { class: 'alignright icons-feeds', title: "RSS Feed" }) %>
</h2>
<% if @news.count.to_i > 0 %>
<table id="messages">
Expand Down
2 changes: 1 addition & 1 deletion src/webui/app/views/main/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<%= render :partial => 'news' %>

<div id="workerstatus_placeholder"></div>
<%= javascript_tag do %>
<% content_for :ready_function do %>
$.ajax({
url: '<%= url_for(:controller => 'main', :action => 'systemstatus') %>',
success: function(data) { $('#workerstatus_placeholder').html(data); }
Expand Down
9 changes: 5 additions & 4 deletions src/webui/app/views/vendor/bento/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<%= yield :head_javascript %>
var _paq = _paq || [];
$(function() {
<%= yield :ready_function %>
<% if CONFIG['theme'] == 'bento' %>
callPiwik();
<% else %>
setup_favorites();
<% end %>
<%= yield :ready_function %>
});
<% end %>
<%= csrf_meta_tag %>
Expand All @@ -37,7 +37,7 @@

<div id="subheader" class="container_16">
<div id="breadcrump" class="grid_10 alpha">
<%= image_tag( "home_grey.png" ) %><%= link_to "#{@configuration ? @configuration['title'] : 'Open Build Service'}", :controller => 'main', :action => :index %>
<%= sprite_tag( "home_grey" ) %><%= link_to "#{@configuration ? @configuration['title'] : 'Open Build Service'}", :controller => 'main', :action => :index %>
<% if @crumb_list %>
<% @crumb_list.each do |link| %>
&gt;
Expand All @@ -59,15 +59,16 @@
<div id="dialog_wrapper" style="display: none"></div>

<!-- Start: Main Content Area -->
<div id="content" class="container_16 content-wrapper">
<div id="content"><div class="container_16 content-wrapper">

<% if @layouttype == "custom" %>
<%= content_for?(:content) ? yield(:content) : yield %>
<% else %>
<div class="grid_16 box box-shadow alpha omega">
<%= content_for?(:content) ? yield(:content) : yield %>
</div>
<% end %>
</div>
</div></div>
<!-- End: Main Content Area -->

<div style="clear: both;"></div>
Expand Down
2 changes: 1 addition & 1 deletion src/webui/script/update_bento.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ copy $themedir/bento/images/icons/user_delete.png ./app/assets/icons/user_delete
copy $themedir/bento/images/icons/user_edit.png ./app/assets/icons/user_edit.png
copy $themedir/bento/images/icons/user_green.png ./app/assets/icons/user_green.png
copy $themedir/bento/images/icons/help.png ./app/assets/icons/help.png
copy $themedir/bento/images/home_grey.png ./app/assets/images/home_grey.png
copy $themedir/bento/images/home_grey.png ./app/assets/icons/home_grey.png
copy $themedir/bento/images/sponsors/sponsor_suse.png ./app/assets/icons/sponsor_suse.png
copy $themedir/bento/images/sponsors/sponsor_amd.png ./app/assets/icons/sponsor_amd.png
copy $themedir/bento/images/sponsors/sponsor_b1-systems.png ./app/assets/icons/sponsor_b1-systems.png
Expand Down

0 comments on commit 8f0b48d

Please sign in to comment.