Commit 9fc5216c authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells

General bug fixes (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Ib9b1ee3b0b3dc77cd0080f28c12e87d8d1af2422
parent ec2374e7
......@@ -125,7 +125,7 @@ $padding-base-horizontal: 12px !default;
$padding-large-vertical: 10px !default;
$padding-large-horizontal: 16px !default;
$padding-small-vertical: 5px !default;
$padding-small-vertical: 2.3px !default;
$padding-small-horizontal: 10px !default;
$padding-xs-vertical: 1px !default;
......@@ -234,9 +234,9 @@ $input-color-placeholder: #999 !default;
//** Default `.form-control` height
$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
//** Large `.form-control` height
$input-height-large: (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
$input-height-large: (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) - 4) !default;
//** Small `.form-control` height
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 5) !default;
$legend-color: $gray-dark !default;
$legend-border-color: #e5e5e5 !default;
......
This diff is collapsed.
<div id="wall" class="wall">
{if $wallmessage}
<div class="lead text-small pll ptl">{$wallmessage}</div>
<div class="lead text-small text-center ptl">{$wallmessage}</div>
{/if}
{if $wallposts}
{foreach from=$wallposts item=wallpost}
......
......@@ -14,13 +14,6 @@
}
}
.btn-sm,
.btn-xs {
.icon {
font-size: $fa-font-size-base;
}
}
.btn-link-danger {
color: $brand-danger;
}
......
......@@ -5,6 +5,9 @@
display: table;
border: 1px solid $panel-default-border;
overflow: hidden;
z-index: 1;
position: relative;
&.left {
position:absolute;
......
$height: 35px;
.dropdown-group {
position: relative;
......@@ -14,7 +13,7 @@ $height: 35px;
width: 210px;
z-index: 2;
float: left;
height: $height;
height: $input-height-base;
input {
@include border-right-radius(0);
margin-top: 24px;
......@@ -27,13 +26,13 @@ $height: 35px;
}
.picker {
height: $height;
height: $input-height-base;
overflow: hidden;
width: 210px;
}
.dropdown-connect {
height: $height;
height: $input-height-base;
position: relative;
......@@ -58,7 +57,7 @@ $height: 35px;
select {
-webkit-appearance: none;
background: transparent;
height: $height;
height: $input-height-base;
left: 0;
margin: 0;
outline: none;
......@@ -77,37 +76,65 @@ $height: 35px;
}
.pieform .picker {
position: relative;
background: #fff;
display: inline-block;
width: 230px;
&:before {
content: "\25BE";
font-family: "FontAwesome";
margin-top: 9px;
position: absolute;
right: 0%;
top: 0;
z-index: 0;
height: 17px;
padding-left: 10px;
padding-right: 10px;
line-height: 16px;
z-index: 2;
}
select.form-control {
-webkit-appearance: none;
background: transparent;
height: $height;
left: 0;
margin: 0;
outline: none;
padding-right: 50px;
cursor: pointer;
top: 0;
width: 100%;
.pieform {
.picker {
position: relative;
background: #fff;
display: inline-block;
width: 230px;
max-width: 100%;
z-index: 5;
&:before {
content: "\25BE";
font-family: "FontAwesome";
margin-top: 9px;
position: absolute;
right: 0%;
top: 0;
z-index: 0;
height: 17px;
padding-left: 10px;
padding-right: 10px;
line-height: 16px;
z-index: 2;
}
select.form-control {
-webkit-appearance: none;
background: transparent;
height: $input-height-base;
left: 0;
margin: 0;
outline: none;
cursor: pointer;
top: 0;
width: 100%;
max-width: 100%;
z-index: 5;
}
}
.input-sm {
.picker {
&:before {
margin-top: 6px;
}
select.form-control {
height: $input-height-small;
line-height: $input-height-small / 2 + 2;
}
}
}
.input-lg {
&:before {
margin-top: 12px;
}
.picker select.form-control {
padding-top: 5px;
padding-bottom: 5px;
height: $input-height-large;
line-height: $input-height-large / 2 + 3;
}
}
}
\ No newline at end of file
......@@ -30,10 +30,18 @@ h1 {
}
~ form.with-heading {
margin-top: -20px;
//background-color: darken($panel-default-heading-bg, 2%);
background-color: #f7f7f7;
padding: 10px;
border-bottom: 1px solid #eee;
~ form.with-heading {
padding-top: 0;
margin-top: -1px;
max-width: 100%;
}
//used to align form on profile page
&.with-user-icon {
padding-left: 92px;
}
}
}
......
......@@ -126,7 +126,7 @@ $padding-base-horizontal: 12px !default;
$padding-large-vertical: 10px !default;
$padding-large-horizontal: 16px !default;
$padding-small-vertical: 5px !default;
$padding-small-vertical: 2.3px !default;
$padding-small-horizontal: 10px !default;
$padding-xs-vertical: 1px !default;
......@@ -235,9 +235,9 @@ $input-color-placeholder: #999 !default;
//** Default `.form-control` height
$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
//** Large `.form-control` height
$input-height-large: (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
$input-height-large: (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) - 4) !default;
//** Small `.form-control` height
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 5) !default;
$legend-color: $gray-dark !default;
$legend-border-color: #e5e5e5 !default;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -3,11 +3,11 @@
<a href="{profile_url($user)}" class="prxxl mrl">
{$user->display_name}
{if $user->pending}
<em class="pendingfriend">
<em class="text-small pendingfriend">
- {str tag='pendingsince' section='group' arg1=$user->pending_time}
</em>
{elseif $user->friend && $page == 'find'}
<em class="existingfriend">
<em class="text-small existingfriend">
- {str tag='existingfriend' section='group'}
</em>
{/if}
......
......@@ -48,6 +48,7 @@
</li>
{elseif $user->requestedfriendship}
<li class="notbtn pbm">
<span class="icon icon-lg text-success icon-check prs"></span>
<span>
{str tag='friendshiprequested' section='group'}
</span>
......
{if $microheaders}
{include file="viewmicroheader.tpl"}
{else}
{include file="header.tpl"}
{/if}
{if $relationship == 'pending'}
</div>
......@@ -46,96 +42,87 @@
{/if}
</h1>
<div id="userview">
<div class="btn-group btn-group-top">
{if $ownprofile}
<a title="{str tag=editthisview section=view}" href="{$WWWROOT}view/blocks.php?profile=1" class="btn btn-default">
<span class="icon-pencil icon icon-lg prs"></span>
{str tag=editthisview section=view}
</a>
{/if}
{if $loginas}
<a href="{$WWWROOT}admin/users/changeuser.php?id={$USERID}" class="btn-login btn btn-default">
<span class="icon-user-secret icon icon-lg prs"></span>
{$loginas}
</a>
{if $USER->get('admin')}
<a href="{$WWWROOT}admin/users/edit.php?id={$USERID}" class="btn-edit btn btn-default">
<span class="icon-cogs icon icon-lg prs"></span>
{str tag=accountsettings section=admin}
</a>
{/if}
{/if}
<div class="btn-group btn-group-top">
{if $ownprofile}
<a title="{str tag=editthisview section=view}" href="{$WWWROOT}view/blocks.php?profile=1" class="btn btn-default">
<span class="icon-pencil icon icon-lg prs"></span>
{str tag=editthisview section=view}
</a>
{/if}
{if $loginas}
<a href="{$WWWROOT}admin/users/changeuser.php?id={$USERID}" class="btn-login btn btn-default">
<span class="icon-user-secret icon icon-lg prs"></span>
{$loginas}
</a>
{if $canmessage}
<a href="{$WWWROOT}user/sendmessage.php?id={$USERID}&amp;returnto=view" class="btn-message btn btn-default">
<span class="icon-envelope icon icon-lg prs"></span>
{str tag='sendmessage' section='group'}
{if $USER->get('admin')}
<a href="{$WWWROOT}admin/users/edit.php?id={$USERID}" class="btn-edit btn btn-default">
<span class="icon-cogs icon icon-lg prs"></span>
{str tag=accountsettings section=admin}
</a>
{/if}
{if $relationship == 'existingfriend'}
<a href="{$WWWROOT}user/removefriend.php?id={$USERID}&amp;returnto=view" class="btn-del btn btn-default">
<span class="icon-user-times icon icon-lg prs text-danger"></span>
{str tag='removefromfriendslist' section='group'}
</a>
{elseif $relationship == 'none' && $friendscontrol == 'auto'}
{$newfriendform|safe}
{elseif $relationship == 'none' && $friendscontrol == 'auth'}
<a href="{$WWWROOT}user/requestfriendship.php?id={$USERID}&amp;returnto=view" class="btn-friend btn btn-default">
<span class="icon-user-plus icon icon-lg prs text-success"></span>
{str tag='requestfriendship' section='group'}
{/if}
{if $canmessage}
<a href="{$WWWROOT}user/sendmessage.php?id={$USERID}&amp;returnto=view" class="btn-message btn btn-default">
<span class="icon-envelope icon icon-lg prs"></span>
{str tag='sendmessage' section='group'}
</a>
{/if}
{if $relationship == 'existingfriend'}
<a href="{$WWWROOT}user/removefriend.php?id={$USERID}&amp;returnto=view" class="btn-del btn btn-default">
<span class="icon-user-times icon icon-lg prs text-danger"></span>
{str tag='removefromfriendslist' section='group'}
</a>
{elseif $relationship == 'none' && $friendscontrol == 'auto'}
{$newfriendform|safe}
{elseif $relationship == 'none' && $friendscontrol == 'auth'}
<a href="{$WWWROOT}user/requestfriendship.php?id={$USERID}&amp;returnto=view" class="btn-friend btn btn-default">
<span class="icon-user-plus icon icon-lg prs text-success"></span>
{str tag='requestfriendship' section='group'}
</a>
{/if}
</div>
{if $inviteform || $addform}
{if $inviteform}
{$inviteform|safe}
{/if}
</div>
{if $addform}
{$addform|safe}
{/if}
{/if}
<div class="row">
<div class="col-md-8 ptxl">
{if $institutions}
<p class="pll lead text-small">
<span class="icon icon-lg icon-university prs"></span>
{$institutions|safe}
</p>
{/if}
{if $invitedlist}
<p class="pll lead text-small">
<span class="icon icon-lg icon-users prs"></span>
{str tag=groupinvitesfrom section=group}
{$invitedlist}
</p>
{/if}
<div class="row">
<div class="col-md-8 ptxl">
{if $institutions}
<p class="pll lead text-small">
<span class="icon icon-lg icon-university prs"></span>
{$institutions|safe}
</p>
{/if}
{if $invitedlist}
<p class="pll lead text-small">
<span class="icon icon-lg icon-users prs"></span>
{str tag=groupinvitesfrom section=group}
{$invitedlist}
</p>
{/if}
{if $requestedlist}
<p class="pll lead text-small">
<span class="icon icon-lg icon-users prs"></span>
{str tag=requestedmembershipin section=group}
{$requestedlist}
</p>
{/if}
</div>
{if $inviteform || $addform}
<div class="col-md-4 ptxl">
<div class="inviteform panel panel-warning">
<div class="panel-heading">
{if $inviteform}
<div class="inviteform pbs">
{$inviteform|safe}
</div>
{/if}
{if $addform}
<div class="addform">
{$addform|safe}
</div>
{/if}
</div>
</div>
</div>
{if $requestedlist}
<p class="pll lead text-small">
<span class="icon icon-lg icon-users prs"></span>
{str tag=requestedmembershipin section=group}
{$requestedlist}
</p>
{/if}
</div>
</div>
<div id="view" class="cl">
<div id="bottom-pane">
......@@ -151,8 +138,5 @@
</div>
</div>
{if $microheaders}{include file="microfooter.tpl"}{else}{include file="footer.tpl"}{/if}
{include file="footer.tpl"}
......@@ -62,6 +62,7 @@ $form = pieform(array(
),
),
'submit' => array(
'class' => 'btn btn-default',
'type' => 'submitcancel',
'value' => array(get_string('requestfriendship', 'group'), get_string('cancel')),
'goto' => $goto,
......
......@@ -190,25 +190,33 @@ if (!empty($loggedinid) && $loggedinid != $userid) {
'name' => 'invite',
'successcallback' => 'invite_submit',
'renderer' => 'div',
'class' => 'form-inline form-short',
'class' => 'form-inline with-heading pbs',
'elements' => array(
'group' => array(
'class' => 'last hide-label',
'type' => 'select',
'title' => get_string('inviteusertojoingroup', 'group'),
'collapseifoneoption' => false,
'options' => $invitelist,
'defaultvalue' => $default,
),
'id' => array(
'type' => 'hidden',
'value' => $userid,
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-primary',
'value' => get_string('sendinvitation', 'group'),
),
'invitegroup' => array (
'type' => 'fieldset',
'class' => 'input-group',
'elements' => array(
'group' => array(
'class' => 'last hide-label input-sm',
'type' => 'select',
'title' => get_string('inviteusertojoingroup', 'group'),
'collapseifoneoption' => false,
'options' => $invitelist,
'defaultvalue' => $default,
),
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-sm btn-primary input-group-btn',
'value' => '<span class="icon icon-paper-plane prs"></span>' . get_string('sendinvitation', 'group'),
)
)
)
),
));
$groupinvitedlistform = $inviteform;
......@@ -222,26 +230,34 @@ if (!empty($loggedinid) && $loggedinid != $userid) {
'name' => 'addmember',
'successcallback' => 'addmember_submit',
'renderer' => 'div',
'class' => 'form-inline form-short',
'class' => 'form-inline with-heading with-user-icon',
'autofocus' => false,
'elements' => array(
'group' => array(
'class' => 'last hide-label',
'type' => 'select',
'title' => get_string('addusertogroup', 'group'),
'collapseifoneoption' => false,
'options' => $controlledlist,
'defaultvalue' => $default,
),
'member' => array(
'type' => 'hidden',
'value' => $userid,
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-primary',
'value' => get_string('add'),
),
'addgroup' => array (
'type' => 'fieldset',
'class' => 'input-group',
'elements' => array(
'group' => array(
'class' => 'last hide-label input-sm',
'type' => 'select',
'title' => get_string('addusertogroup', 'group'),
'collapseifoneoption' => false,
'options' => $controlledlist,
'defaultvalue' => $default,
),
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-sm btn-primary input-group-btn',
'value' => '<span class="icon icon-plus prs"></span>' . get_string('add'),
)
)
)
),
));
$grouprequestedlistform = $addform;
......
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