Commit 3c46c68d authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells

Standardize css (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I991b636473d7a4f2d3f0d091331c849e413b925e
parent d37d67e6
......@@ -13701,6 +13701,13 @@ label .col-collapse,
height: 40px;
line-height: 23px;
}
/* line 140, ../../../raw/static/sass/form/_dropdown-group.scss */
.pieform .select-group .input-group-addon {
display: inline-block;
float: left;
height: 35px;
line-height: 17.5px;
}
/* line 1, ../../../raw/static/sass/components/_arrow-bar.scss */
.arrow-bar {
......@@ -14461,7 +14468,12 @@ span.help:hover .icon, span.help:hover .mce-ico.mce-i-icon.tooltoggle-icon, span
max-width: 100%;
}
/* line 65, ../../../raw/static/sass/components/_contextual-help.scss */
/* line 64, ../../../raw/static/sass/components/_contextual-help.scss */
.input-group.with-help {
position: relative;
padding-right: 40px;
}
/* line 67, ../../../raw/static/sass/components/_contextual-help.scss */
.input-group.with-help select:not(:first-child),
.input-group.with-help input:not(:first-child) {
-moz-border-radius-topright: 3px;
......
......@@ -47,21 +47,25 @@
<div class="pull-right">
{$activitylist['pagination']|safe}
</div>
<form method="post" class="form-inline form-select-filter">
<form method="post" class="form-inline form-select-filter pieform">
<div class="form-group">
<label for="notifications_type">{str section='activity' tag='type'}:</label>
<div class="input-group with-help">
<span class="input-group-addon" id="icon-addon-filter">
<div class="input-group select-group with-help">
<div class="input-group-addon" id="icon-addon-filter">
<span class="icon icon-filter"></span>
</span>
<select id="notifications_type" name="type">
{foreach from=$options item=name key=t}
<option value="{$t}"{if $type == $t} selected{/if}>
{$name}
</option>
{/foreach}
</select>{contextualhelp plugintype='core' pluginname='activity' section='activitytypeselect'}
</div>
<div class="select form-group">
<div class="picker">
<select class="form-control select" id="notifications_type" name="type">
{foreach from=$options item=name key=t}
<option value="{$t}"{if $type == $t} selected{/if}>
{$name}
</option>
{/foreach}
</select>
</div>
</div>
{contextualhelp plugintype='core' pluginname='activity' section='activitytypeselect'}
</div>
</div>
</form>
......
......@@ -43,20 +43,25 @@
<div class="pull-right">
{$activitylist['pagination']|safe}
</div>
<form method="post" class="form-inline form-select-filter">
<form method="post" class="form-inline form-select-filter pieform">
<div class="form-group">
<label for="notifications_type">{str section='activity' tag='type'}:</label>
<div class="input-group with-help">
<span class="input-group-addon" id="icon-addon-filter">
<div class="input-group select-group with-help">
<div class="input-group-addon" id="icon-addon-filter">
<span class="icon icon-filter"></span>
</span>
<select id="notifications_type" name="type">
{foreach from=$options item=name key=t}
<option value="{$t}"{if $type == $t} selected{/if}>
{$name}
</option>
{/foreach}
</select>{contextualhelp plugintype='core' pluginname='activity' section='activitytypeselect'}
</div>
<div class="select form-group">
<div class="picker">
<select class="form-control select" id="notifications_type" name="type">
{foreach from=$options item=name key=t}
<option value="{$t}"{if $type == $t} selected{/if}>
{$name}
</option>
{/foreach}
</select>
</div>
</div>
{contextualhelp plugintype='core' pluginname='activity' section='activitytypeselect'}
</div>
</div>
</form>
......
......@@ -62,6 +62,8 @@ span.help {
}
.input-group.with-help {
position: relative;
padding-right:40px;
select:not(:first-child),
input:not(:first-child) {
@include border-right-radius(3px);
......
......@@ -136,5 +136,14 @@
}
}
.select-group {
.input-group-addon {
display: inline-block;
float: left;
height: $input-height-base;
line-height: $input-height-base / 2;
}
}
}
\ No newline at end of file
......@@ -3,7 +3,7 @@
*/
$mahara-green: #335804;
$mahara-green-light: #5C8727;
$mahara-green-light: #5f9422;
$mahara-green-lime: #B9CB2E;
$mahara-green-bright: darken(#93be42, 5%);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
{include file="header.tpl"}
<div id="notifications">
<form method="post" class="form-inline">
<div class="form-group">
<form method="post" class="form-inline pieform">
<div class="form-group select">
<label for="notifications_type">{str section='activity' tag='type'}:</label>
<select id="notifications_type" name="type">
<option value="all">--</option>
{foreach from=$options item=name key=t}
<option value="{$t}"{if $type == $t} selected{/if}>{$name}</option>
{/foreach}
</select>{contextualhelp plugintype='core' pluginname='activity' section='activitytypeselect'}
<div class="picker">
<select class="form-control select" id="notifications_type" name="type">
<option value="all">--</option>
{foreach from=$options item=name key=t}
<option value="{$t}"{if $type == $t} selected{/if}>{$name}</option>
{/foreach}
</select>
</div>
{contextualhelp plugintype='core' pluginname='activity' section='activitytypeselect'}
</div>
</form>
......
......@@ -40,28 +40,11 @@
</form>
<div id="view-wizard-controls" class="col-collapse-offset col-with-collapse">
<!-- {if $issitetemplate}
<form action="{$WWWROOT}admin/site/views.php" method="GET">
<input class="submit btn btn-success" type="submit" value="{str tag=displayview section=view}">
</form>
{else}
<form action="{$WWWROOT}{if $groupid}{if $viewtype == 'grouphomepage'}{$groupurl}{else}view/groupviews.php{/if}{elseif $institution}view/institutionviews.php{elseif $viewtype == 'dashboard'}index.php{else}view/index.php{/if}" method="GET">
{if $groupid}
{if $viewtype == 'grouphomepage'}
<input type="hidden" name="id" value="{$groupid}">
{else}
<input type="hidden" name="group" value="{$groupid}">
{/if}
{elseif $institution}
<input type="hidden" name="institution" value="{$institution}">
{/if}
<input class="submit btn btn-success" type="submit" value="{str tag=displayview section=view}">
</form>
{/if} -->
{if !$issitetemplate}
<a class="btn btn-success" href="{$displaylink}">
<a class="btn btn-default" href="{$displaylink}">
{str tag=displayview section=view}
<span class="icon icon-arrow-circle-right mls"></span>
</a>
{/if}
</div>
......
{if !$issitetemplate}
<a class="pts pull-left with-heading" href="{$displaylink}">
{str tag=displayview section=view}
</a>
{if $edittitle || $viewtype == 'profile'}
<a class="pts plm pull-left with-heading" href="{$WWWROOT}view/access.php?id={$viewid}{if $new}&new=1{/if}">
<span class="icon icon-unlock-alt"></span>
{str tag=shareview section=view}
</a>
{/if}
{/if}
<div class="toolbar mbxl pbxl">
<div class="btn-group btn-toolbar btn-group-top">
......@@ -28,20 +42,8 @@
{/if}
</div>
</div>
{if !$issitetemplate}
<a class="text-small pull-left" href="{$displaylink}">
{str tag=displayview section=view}
</a>
{if $edittitle || $viewtype == 'profile'}
<a class="plm text-small pull-left" href="{$WWWROOT}view/access.php?id={$viewid}{if $new}&new=1{/if}">
<span class="icon icon-unlock-alt"></span>
{str tag=shareview section=view}
</a>
{/if}
{/if}
</div>
......@@ -74,29 +74,30 @@ if ($blockid = param_integer('blockconfig', 0)) {
}
$view->set_edit_nav();
$state = get_string('editcontent', 'view');
if ($view->get('type') == 'profile') {
$profile = true;
$title = get_string('usersprofile', 'mahara', display_name($view->get('owner'), null, true));
define('TITLE', $title . ': ' . get_string('editcontent', 'view'));
define('TITLE', $title);
}
else if ($view->get('type') == 'dashboard') {
$dashboard = true;
$title = get_string('usersdashboard', 'mahara', display_name($view->get('owner'), null, true));
define('TITLE', $title . ': ' . get_string('editcontent', 'view'));
define('TITLE', $title );
}
else if ($view->get('type') == 'grouphomepage') {
$title = get_string('grouphomepage', 'view');
if ($view->get('owner') != "0") {
$groupurl = group_homepage_url(get_record('group', 'id', $view->get('group')), false);
}
define('TITLE', $title . ': ' . get_string('editcontent', 'view'));
define('TITLE', $title);
}
else if ($new) {
define('TITLE', get_string('editcontent', 'view'));
define('TITLE', get_string('notitle', 'view'));
}
else {
define('TITLE', $view->get('title') . ': ' . get_string('editcontent', 'view'));
define('TITLE', $view->get('title'));
$editabletitle = true;
}
......@@ -294,5 +295,6 @@ $smarty->assign('issiteview', isset($institution) && ($institution == 'mahara'))
if ($view->get('owner') == "0") {
$smarty->assign('issitetemplate', true);
}
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEHEADING', $state);
$smarty->assign('subsectionheading', TITLE);
$smarty->display('view/blocks.tpl');
......@@ -49,13 +49,16 @@ if ($group && !group_within_edit_window($group)) {
$new = param_boolean('new', 0);
$state = get_string('edittitleanddescription', 'view');
if ($new) {
define('TITLE', get_string('edittitleanddescription', 'view'));
define('TITLE', get_string('notitle', 'view'));
}
else {
define('TITLE', $view->get('title') . ': ' . get_string('edittitleanddescription', 'view'));
define('TITLE', $view->get('title'));
}
require_once('pieforms/pieform.php');
$formatstring = '%s (%s)';
......@@ -253,5 +256,6 @@ if (get_config('viewmicroheaders')) {
$smarty->assign('microheadertitle', $view->display_title(true, false, false));
}
$smarty->assign('issiteview', isset($institution) && ($institution == 'mahara'));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEHEADING', $state);
$smarty->assign('subsectionheading', TITLE);
$smarty->display('view/edit.tpl');
......@@ -25,11 +25,13 @@ $id = param_integer('id');
$new = param_boolean('new');
$view = new View($id);
$state = get_string('changemyviewlayout', 'view');
if ($new) {
define('TITLE', get_string('changemyviewlayout', 'view'));
define('TITLE', get_string('notitle', 'view'));
}
else {
define('TITLE', $view->get('title') . ': ' . get_string('changemyviewlayout', 'view'));
define('TITLE', $view->get('title'));
}
if (!$USER->can_edit_view($view)) {
......@@ -193,7 +195,8 @@ $smarty->assign('issiteview', $view->get('institution') == 'mahara');
if ($view->get('owner') == "0") {
$smarty->assign('issitetemplate', true);
}
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEHEADING', $state);
$smarty->assign('subsectionheading', TITLE);
$smarty->display('view/layout.tpl');
function viewlayout_validate(Pieform $form, $values) {
......
......@@ -110,18 +110,21 @@ $searchform = pieform(array(
'collapsed' => true,
'elements' => array(
'type' => array(
'class' => 'fullwidth',
'type' => 'select',
'title' => get_string('searchwithin') . ': ',
'options' => $searchoptions,
'defaultvalue' => $searchtype,
),
'sort' => array(
'class' => 'fullwidth',
'type' => 'select',
'title' => get_string('sortresultsby') . ' ',
'options' => $sortoptions,
'defaultvalue' => $sort,
),
'share' => array(
'class' => 'fullwidth',
'type' => 'checkboxes',
'class' => 'stacked',
'title' => get_string('sharedwith', 'view') . ': ',
......
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