merge branch og-portcontrol

This commit is contained in:
Oliver Gorwits
2012-11-24 23:29:00 +00:00
parent 3724e3ed37
commit 083f3a51ed
31 changed files with 1368 additions and 377 deletions

View File

@@ -1,15 +1,12 @@
<img class="sidebar_toggle" id="sidebar_toggle_img_out"
src="[% uri_base %]/images/diagona_settings.png"
rel="tooltip" data-placement="left" data-offset="5" title="Show Search Options"/>
<i class="sidebar_toggle icon-wrench icon-large" id="sidebar_toggle_img_out"
rel="tooltip" data-placement="left" data-offset="5" title="Show Sidebar"></i>
<div class="container-fluid">
<div class="sidebar">
<div class="well">
<img class="sidebar_toggle" id="sidebar_toggle_img_in"
src="[% uri_base %]/images/splashyfish_right.png"
rel="tooltip" data-placement="left" data-offset="5" title="Hide Sidebar"/>
<div id="sidebar_pin_box" class="well">
<img id="sidebar_pin" src="[% uri_base %]/images/matte_basic_pin.png"/>
</div>
<i class="sidebar_toggle icon-signout" id="sidebar_toggle_img_in"
rel="tooltip" data-placement="left" data-offset="5" title="Hide Sidebar"></i>
<i class="sidebar_pin icon-pushpin"
rel="tooltip" data-placement="left" data-offset="5" title="Pin Sidebar"></i>
<div class="tab-content">
[% FOREACH tab IN vars.tabs %]
<div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">