Commit c3a5b865 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells
Browse files

Webservices (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ib8c79dc8d1e951a497e4ace72752a604455c9493
parent 94e7e658
......@@ -11,4 +11,7 @@ $arrow-link-active-color: $brand-primary;
$section-heading-color: #999;
$admin-title-color: #fff;
$admin-title-bg: $brand-primary;
\ No newline at end of file
$admin-title-bg: $brand-primary;
$dashboard-widget-bg: darken(#f9f9f9, 2%);
$dashboard-widget-color: $brand-primary;
\ No newline at end of file
......@@ -727,12 +727,12 @@ a.text-warning:hover {
/* line 5, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss */
.text-danger {
color: #d11213;
color: #ec2021;
}
/* line 8, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss */
a.text-danger:hover {
color: #a20e0f;
color: #c81112;
}
/* line 119, ../../../lib/bootstrap/assets/stylesheets/bootstrap/_type.scss */
......@@ -2863,29 +2863,29 @@ select[multiple].input-lg,
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline, .has-error.radio label, .has-error.checkbox label, .has-error.radio-inline label, .has-error.checkbox-inline label {
color: #d11213;
color: #ec2021;
}
/* line 21, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_forms.scss */
.has-error .form-control {
border-color: #d11213;
border-color: #ec2021;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
/* line 24, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_forms.scss */
.has-error .form-control:focus {
border-color: #a20e0f;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f15859;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f15859;
border-color: #c81112;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f47e7f;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f47e7f;
}
/* line 31, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_forms.scss */
.has-error .input-group-addon {
color: #d11213;
border-color: #d11213;
color: #ec2021;
border-color: #ec2021;
background-color: #fcdcdc;
}
/* line 37, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_forms.scss */
.has-error .form-control-feedback {
color: #d11213;
color: #ec2021;
}
/* line 371, ../../../lib/bootstrap/assets/stylesheets/bootstrap/_forms.scss */
......@@ -5237,7 +5237,7 @@ a.thumbnail.active {
.alert-danger {
background-color: #fcdcdc;
border-color: #fac4ce;
color: #d11213;
color: #ec2021;
}
/* line 8, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_alerts.scss */
.alert-danger hr {
......@@ -5245,7 +5245,7 @@ a.thumbnail.active {
}
/* line 11, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_alerts.scss */
.alert-danger .alert-link {
color: #a20e0f;
color: #c81112;
}
@-webkit-keyframes progress-bar-stripes {
......@@ -5568,13 +5568,13 @@ a.list-group-item-warning.active, a.active.list-group-item.draft, a.list-group-i
/* line 4, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_list-group.scss */
.list-group-item-danger {
color: #d11213;
color: #ec2021;
background-color: #fcdcdc;
}
/* line 11, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_list-group.scss */
a.list-group-item-danger {
color: #d11213;
color: #ec2021;
}
/* line 14, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_list-group.scss */
a.list-group-item-danger .list-group-item-heading {
......@@ -5582,14 +5582,14 @@ a.list-group-item-danger .list-group-item-heading {
}
/* line 18, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_list-group.scss */
a.list-group-item-danger:hover, a.list-group-item-danger:focus {
color: #d11213;
color: #ec2021;
background-color: #fac4c5;
}
/* line 23, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_list-group.scss */
a.list-group-item-danger.active, a.list-group-item-danger.active:hover, a.list-group-item-danger.active:focus {
color: #fff;
background-color: #d11213;
border-color: #d11213;
background-color: #ec2021;
border-color: #ec2021;
}
/* line 117, ../../../lib/bootstrap/assets/stylesheets/bootstrap/_list-group.scss */
......@@ -6014,7 +6014,7 @@ a.list-group-item-danger.active, a.list-group-item-danger.active:hover, a.list-g
}
/* line 6, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_panels.scss */
.panel-danger > .panel-heading {
color: #d11213;
color: #ec2021;
background-color: #fcdcdc;
border-color: #fac4ce;
}
......@@ -6025,7 +6025,7 @@ a.list-group-item-danger.active, a.list-group-item-danger.active:hover, a.list-g
/* line 14, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_panels.scss */
.panel-danger > .panel-heading .badge {
color: #fcdcdc;
background-color: #d11213;
background-color: #ec2021;
}
/* line 20, ../../../lib/bootstrap/assets/stylesheets/bootstrap/mixins/_panels.scss */
.panel-danger > .panel-footer + .panel-collapse > .panel-body {
......@@ -15593,7 +15593,7 @@ a.user-icon:hover:after, a.user-icon:focus:after, a .user-icon:hover:after, a .u
padding: 13px 15px;
height: 90px;
border-top: 3px solid #a4056a;
background-color: #f1f1f1;
background-color: #ececec;
}
@media (min-width: 768px) and (max-width: 1200px) {
/* line 16, ../../raw/sass/features/_dashboard-widget.scss */
......@@ -16138,7 +16138,7 @@ a.user-icon:hover:after, a.user-icon:focus:after, a .user-icon:hover:after, a .u
}
/* line 37, ../../raw/sass/lib/_star.scss */
.rating-cancel.star-rating-hover a {
color: #d11213;
color: #ec2021;
}
/* line 41, ../../raw/sass/lib/_star.scss */
.rating-cancel.star-rating-readonly {
......
{include file='header.tpl'}
<div><b>{str tag="testclientinstructions" section="auth.webservice"}</b></div>
<div class="lead">
{str tag="testclientinstructions" section="auth.webservice"}
</div>
{if $disabled}
<div class="error">{str tag=wsauthnotenabled section='auth.webservice'}</div>
<div class="error alert alert-warning">{str tag=wsauthnotenabled section='auth.webservice'}</div>
{elseif $disabledprotocols}
<div class="error">{str tag=nowsprotocolsenabled section='auth.webservice' arg1=$disabledprotocols}</div>
<div class="error alert alert-warning">{str tag=nowsprotocolsenabled section='auth.webservice' arg1=$disabledprotocols}</div>
{else}
<div class="panel panel-default panel-body">
{$form|safe}
</div>
{/if}
{include file='footer.tpl'}
\ No newline at end of file
{include file="header.tpl"}
<div id="logsearchformcontainer">
<div id="logsearchformcontainer" class="panel panel-default panel-body">
{$form|safe}
</div>
<div id="results" class="section">
<h2 id="resultsheading">{str tag="Results"}</h2>
{if $results}
<table id="searchresults" class="tablerenderer fullwidth listing">
<thead>
<tr>
{foreach from=$columns key=f item=c}
<th class="{if $c.sort}search-results-sort-column{if $f == $sortby} {$sortdir}{/if}{/if}{if $c.class} {$c.class}{/if}">
{if $c.sort}
<a href="{$searchurl}&sortby={$f}&sortdir={if $f == $sortby && $sortdir == 'asc'}desc{else}asc{/if}">
{$c.name}
<span class="accessible-hidden">({str tag=sortby} {if $f == $sortby && $sortdir == 'asc'}{str tag=descending}{else}{str tag=ascending}{/if})</span>
</a>
{else}
<div id="results" class="section panel panel-default">
<h2 class="panel-heading" id="resultsheading">{str tag="Results"}</h2>
{if $results}
<table id="searchresults" class="tablerenderer fullwidth listing">
<thead>
<tr>
{foreach from=$columns key=f item=c}
<th class="{if $c.sort}search-results-sort-column{if $f == $sortby} {$sortdir}{/if}{/if}{if $c.class} {$c.class}{/if}">
{if $c.sort}
<a href="{$searchurl}&sortby={$f}&sortdir={if $f == $sortby && $sortdir == 'asc'}desc{else}asc{/if}">
{$c.name}
{/if}
{if $c.help}
{$c.helplink|safe}
{/if}
{if $c.headhtml}<div style="font-weight: normal;">{$c.headhtml|safe}</div>{/if}
</th>
{/foreach}
</tr>
</thead>
<tbody>
{$results|safe}
</tbody>
</table>
{$pagination|safe}
{else}
<div>{str tag="noresultsfound"}</div>
{/if}
</div>
<span class="accessible-hidden">({str tag=sortby} {if $f == $sortby && $sortdir == 'asc'}{str tag=descending}{else}{str tag=ascending}{/if})</span>
</a>
{else}
{$c.name}
{/if}
{if $c.help}
{$c.helplink|safe}
{/if}
{if $c.headhtml}<div style="font-weight: normal;">{$c.headhtml|safe}</div>{/if}
</th>
{/foreach}
</tr>
</thead>
<tbody>
{$results|safe}
</tbody>
</table>
{$pagination|safe}
{else}
<div class="panel-body">
<p class="ptxl pbxl lead text-center">{str tag="noresultsfound"}</p>
</div>
{/if}
</div>
<script type="application/javascript">
// to clear any offset when submitting form again
......
......@@ -17,8 +17,8 @@ $logged-in-height-mobile: 100px;
@include clearfix;
padding: 13px 15px;
height: $logged-in-height;
border-top: 3px solid $brand-primary;
background-color: darken($panel-default-heading-bg, 3%);
border-top: 3px solid $dashboard-widget-color;
background-color: darken($dashboard-widget-bg, 3%);
@media (min-width: $screen-sm-min ) and (max-width: $screen-lg-min ) {
height: $logged-in-height-mobile;
......@@ -44,7 +44,7 @@ $logged-in-height-mobile: 100px;
@include border-radius(50%);
position: relative;
float: left;
background-color: $brand-primary;
background-color: $dashboard-widget-color;
width: 60px;
height: 60px;
text-align:center;
......@@ -122,7 +122,7 @@ $logged-in-height-mobile: 100px;
position: relative;
display: inline-block;
z-index: 2;
background-color: $brand-primary;
background-color: $dashboard-widget-color;
height: $logged-in-height;
margin-right: 15px;
vertical-align: top;
......
......@@ -11,4 +11,7 @@ $arrow-link-active-color: $text-color;
$section-heading-color: #999;
$admin-title-color: #fff;
$admin-title-bg: $brand-primary;
\ No newline at end of file
$admin-title-bg: $brand-primary;
$dashboard-widget-bg: darken(#f9f9f9, 2%);
$dashboard-widget-color: $brand-primary;
\ No newline at end of file
This diff is collapsed.
......@@ -4,5 +4,7 @@
{elseif $pagedescriptionhtml}
{$pagedescriptionhtml|safe}
{/if}
{$form|safe}
<div class="panel panel-default panel-body">
{$form|safe}
</div>
{include file="footer.tpl"}
\ No newline at end of file
......@@ -119,15 +119,17 @@ $form = array(
),
'width' => '280px',
),
'submit' => array(
'type' => 'submit',
'value' => get_string('go'),
),
'onlyerrors' => array(
'onlyerrors' => array(
'type' => 'checkbox',
'class' => 'last',
'title' => get_string('errors', 'auth.webservice'),
'defaultvalue' => $search->onlyerrors,
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-primary',
'value' => get_string('go'),
),
),
);
unset($form['elements'][0]);
......
Supports Markdown
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