Commit 217f4ff9 authored by Liam Sharpe's avatar Liam Sharpe Committed by Aaron Wells
Browse files

Fix dashboard button, search (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I8addcd28f45a7bcb6dcfc1f101d15f2deb31042f
parent 871a254f
...@@ -6,7 +6,7 @@ $logged-in-height-mobile: 100px; ...@@ -6,7 +6,7 @@ $logged-in-height-mobile: 100px;
@include clearfix; @include clearfix;
padding: $grid-gutter-width 0; padding: $grid-gutter-width 0;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
margin-bottom: $grid-gutter-width; margin-bottom: $grid-gutter-width - 10px;
.remove-widgets { .remove-widgets {
font-size: $font-size-small - 2; font-size: $font-size-small - 2;
......
...@@ -62,6 +62,7 @@ $columns: 8; //up to 8 ...@@ -62,6 +62,7 @@ $columns: 8; //up to 8
.row-content { .row-content {
clear: both;
@media (min-width: $screen-sm-min + 1) { @media (min-width: $screen-sm-min + 1) {
margin-left: -2%; margin-left: -2%;
} }
......
...@@ -4,10 +4,15 @@ ...@@ -4,10 +4,15 @@
{include file="homeinfo.tpl" url=$url} {include file="homeinfo.tpl" url=$url}
{/if} {/if}
{if $dashboardview} {if $dashboardview}
{include file="user/dashboard.tpl"} <div class="dashboard-editable">
<div class="align-right" id="editdashboard"> <div class="text-right btn-top-right btn-group btn-group-top mbl" id="editdashboard">
<a class="btn btn-sm btn-success" href="{$WWWROOT}view/blocks.php?id={$viewid}"><span class="btn-edit"><span class="fa fa-pencil prs"> </span> {str tag='editdashboard'}</span></a> <a class="btn btn-default" href="{$WWWROOT}view/blocks.php?id={$viewid}"><span class="btn-edit"><span class="fa fa-pencil prs"> </span> {str tag='editdashboard'}</span></a>
</div> </div>
{include file="user/dashboard.tpl"}
</div>
{/if} {/if}
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<span class="fa fa-arrows move-indicator"></span> <span class="fa fa-arrows move-indicator"></span>
<span class="blockinstance-header"> <span class="blockinstance-header">
{if $configure}{$configtitle}: {str tag=Configure section=view}{else}{$title|default:"[$strnotitle]"}{/if} {if $configure}{$configtitle}: {str tag=Configure section=view}{else}{$title|default:"[$strnotitle]"}{/if}
<span class="fa fa-chevron-down text-watermark fa-sm"></span>
</span> </span>
<span class="blockinstance-controls"> <span class="blockinstance-controls">
...@@ -18,13 +19,10 @@ ...@@ -18,13 +19,10 @@
{/foreach} {/foreach}
<span class="pull-right btn-group btn-group-top">
{if $retractable && !$configure} <span class="pull-right btn-group btn-group-top">
<button alt="{str tag='retractable' section='view'}" title="{str tag='retractable' section='view'}" class="retractablebtn btn btn-inverse btn-xs" data-id="{$id}">
<span class="fa fa-chevron-down"><span>
</button>
{/if}
{if $configurable && !$configure} {if $configurable && !$configure}
<button class="configurebutton btn btn-inverse btn-xs" name="action_configureblockinstance_id_{$id}" alt="{$strconfigtitletext}" data-id="{$id}"> <button class="configurebutton btn btn-inverse btn-xs" name="action_configureblockinstance_id_{$id}" alt="{$strconfigtitletext}" data-id="{$id}">
......
...@@ -106,7 +106,7 @@ $searchform = pieform(array( ...@@ -106,7 +106,7 @@ $searchform = pieform(array(
'advanced' => array( 'advanced' => array(
'type' => 'fieldset', 'type' => 'fieldset',
'legend' => get_string('moreoptions', 'view'), 'legend' => get_string('moreoptions', 'view'),
'class' => 'advanced last', 'class' => 'advanced form-inline last fullwidth',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
'elements' => array( 'elements' => array(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment