Commit f163fa6c authored by Pat Kira's avatar Pat Kira Committed by Aaron Wells
Browse files

Comments on page view (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I2fbc8593a97edf9721edb40fe2ecc0561c98c15b
parent 91927381
// Text modifying class (start with .text-)
.text-default {
color: #333;
color: $text-color;
}
.text-light {
......@@ -26,4 +26,8 @@
.text-regular {
font-size: $font-size-base;
}
.text-thin {
font-weight: 300;
}
\ No newline at end of file
// sr-only (a workaround for including sr-only in media query)
// Note: Meybe bootstrap will add this to their mixins in v.4
// Note: Maybe bootstrap will add this to their mixins in the future
@mixin sr-only() {
position: absolute;
width: 1px;
......@@ -9,4 +9,4 @@
overflow: hidden;
clip: rect(0,0,0,0);
border: 0;
}
\ No newline at end of file
}
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -3,7 +3,7 @@
<div class="text-right btn-top-right btn-group btn-group-top">
<a href="{$WWWROOT}account/delete.php" class="btn btn-default delete">
<span class="fa fa-trash fa-lg text-danger prs"></span>
<span class="text-danger">{str tag=deleteaccount section=account}</span>
<span>{str tag=deleteaccount section=account}</span>
</a>
</div>
{/if}
......
<div class="comments panel-body pt0">
{if $commentcount > 0}
<a class="commentlink" id="block_{$blockid}" href="{$artefacturl}">{str tag=Comments section=artefact.comment} ({$commentcount})</a>
<a class="commentlink text-thin pull-left ptl" id="block_{$blockid}" href="{$artefacturl}">
{str tag=Comments section=artefact.comment} ({$commentcount})
</a>
{else}
{if $allowcomments}
<span id='block_{$blockid}' class="nocomments metadata">{str tag=Comments section=artefact.comment} ({$commentcount})</span>
<span id='block_{$blockid}' class="text-light text-thin nocomments text-default pull-left">
{str tag=Comments section=artefact.comment} ({$commentcount})
</span>
{/if}
{if $allowcomments}
{if !$editing}
<p class="text-right">
<a class="text-thin" href="{$artefacturl}">
<span class="fa fa-lg fa-plus text-primary prs"></span>
{str tag=addcomment section=artefact.comment}
</a>
</p>
{/if}
{/if}
{/if}
{if $allowcomments}
<a class="mtl btn btn-default btn-sm btn-block" href="{$artefacturl}">
<span class="fa fa-lg fa-plus text-primary prs"></span>
{str tag=addcomment section=artefact.comment}
</a>
{/if}
</div>
{if !$editing}
<div class="feedbacktablewrapper">
<div id="feedbacktable_{$blockid}" class="feedbacktable">
{$comments->tablerows|safe}
</div>
</div>
\ No newline at end of file
</div>
{/if}
\ No newline at end of file
{include file="header.tpl"}
<div class="message delete">
<p>{$message}</p>
<div class="message delete ">
<p class="lead">{$message}</p>
{$form|safe}
</div>
{include file="footer.tpl"}
......
{include file="header.tpl"}
<div class="message deletemessage">
<h3>{$subheading}</h3>
<p>{$message}</p>
<p class="lead">{$message}</p>
{$form|safe}
</div>
{include file="footer.tpl"}
......
......@@ -24,10 +24,12 @@
{elseif $group->membershiptype == 'admin'}
<div class="btn-action-list">
<div class="groupuserstatus text-right btn-top-right btn-group btn-group-top">
{if $viewid}
<a href="{$WWWROOT}view/blocks.php?id={$viewid}&{$group->id}" title="{str tag=editcontentandlayout section='view'}" class="btn btn-default">
<span class="fa fa-pencil fa-lg text-default"></span>
<span class="btn-title pls hide-small">{str tag=editthisview section='view'}</span>
</a>
{/if}
<a href="{$WWWROOT}group/edit.php?id={$group->id}" title="{str(tag=editspecific arg1=$group->name)|escape:html|safe} {str tag=settings}" class="btn btn-default">
<span class="fa fa-cog fa-lg text-default"></span>
......
{include file="header.tpl"}
<div class="delete">
<h3>{$subheading}</h3>
<p>{$safemessage|clean_html|safe}</p>
<p class="lead">{$safemessage|clean_html|safe}</p>
{$form|safe}
</div>
{include file="footer.tpl"}
{include file="header.tpl"}
<div class="message attentionmessage">
<p>{$message}</p>
<p class="lead">{$message}</p>
{$form|safe}
</div>
......
{if $microheaders}{include file="viewmicroheader.tpl"}{else}{include file="header.tpl"}{/if}
{include file="header.tpl"}
{if $notrudeform}<div class="message deletemessage">{$notrudeform|safe}</div>{/if}
{if $notrudeform}
<div class="alert alert-danger">
{$notrudeform|safe}
</div>
{/if}
{if $maintitle}<h1 id="viewh1" class="page-header">{$maintitle|safe}</h1>{/if}
{if !$microheaders && ($mnethost || $editurl)}
<div class="btn-group btn-group-top">
{if $editurl}{strip}
{if $new}
<a class="btn btn-default" href="{$editurl}">
{str tag=back}
</a>
{else}
<a title="{str tag=editthisview section=view}" href="{$editurl}" class="btn btn-default">
<span class="fa fa-pencil fa-lg prs"></span>
{str tag=editthisview section=view}
</a>
{/if}
{/strip}{/if}
{if $copyurl}{strip}
{if $editurl}{strip}
{if $new}
<a class="btn btn-default" href="{$editurl}">
{str tag=back}
</a>
{else}
<a title="{str tag=editthisview section=view}" href="{$editurl}" class="btn btn-default">
<span class="fa fa-pencil fa-lg prs"></span>
{str tag=editthisview section=view}
</a>
{/if}
{/strip}{/if}
{if $copyurl}{strip}
<a title="{str tag=copythisview section=view}" href="{$copyurl}" class="btn btn-default">
<span class="text-success fa fa-files-o fa-lg prs"></span>
{str tag=copy section=mahara}
<span class="text-success fa fa-files-o fa-lg prs"></span>
{str tag=copy section=mahara}
</a>
{/strip}{/if}
{if $mnethost}
<a href="{$mnethost.url}" class="btn btn-default">
<span class="fa fa-long-arrow-right fa-lg prs"></span>
{str tag=backto arg1=$mnethost.name}
</a>
{/if}
{/strip}{/if}
{if $mnethost}
<a href="{$mnethost.url}" class="btn btn-default">
<span class="fa fa-long-arrow-right fa-lg prs"></span>
{str tag=backto arg1=$mnethost.name}
</a>
{/if}
</div>
{/if}
{if !$microheaders && $collection}
{include file=collectionnav.tpl}
{if $collection}
{include file=collectionnav.tpl}
{/if}
<p>
{assign var='author_link_index' value=1}
{include file=author.tpl}
<p>
</p>
<div id="view-description">{$viewdescription|clean_html|safe}</div>
<div id="view" class="cb">
<div id="bottom-pane">
<div id="column-container">
{$viewcontent|safe}
<div class="cb">
</div>
</div>
<div id="view">
<div id="bottom-pane">
<div id="column-container">
{$viewcontent|safe}
</div>
<div class="viewfooter">
{if $tags}<div class="tags"><strong>{str tag=tags}:</strong> {list_tags owner=$owner tags=$tags}</div>{/if}
{if $releaseform}<div class="releaseviewform">{$releaseform|safe}</div>{/if}
{if $view_group_submission_form}<div class="submissionform">{$view_group_submission_form|safe}</div>{/if}
{if $feedback->position eq 'base'}
{if $feedback->count || $enablecomments}
<h3 class="title">{str tag="feedback" section="artefact.comment"}</h3>
<div id="feedbacktable" class="feedbacktable fullwidth">
{$feedback->tablerows|safe}
</div>
<div class="viewfooter">
{if $tags}
<div class="tags ptl pbl ">
<strong>{str tag=tags}:</strong>
{list_tags owner=$owner tags=$tags}
</div>
{$feedback->pagination|safe}
{/if}
{/if}
<div id="viewmenu">
{if $feedback->position eq 'base' && $enablecomments}
<a id="add_feedback_link" class="feedback" href="">{str tag=placefeedback section=artefact.comment}</a>
{if $releaseform}
<div class="releaseviewform alert alert-info">
{$releaseform|safe}
</div>
{/if}
{include file="view/viewmenu.tpl"}
{if $view_group_submission_form}
<div class="submissionform list-group-item-default pll">
{$view_group_submission_form|safe}
</div>
{/if}
{if $feedback->position eq 'base'}
{if $feedback->count || $enablecomments}
<h3 class="title">
{str tag="comments" section="artefact.comment"}
</h3>
<div id="feedbacktable" class="feedbacktable fullwidth">
{$feedback->tablerows|safe}
</div>
{$feedback->pagination|safe}
{/if}
{/if}
<div id="viewmenu" class="view-menu ptxl pbxl">
{include file="view/viewmenu.tpl"}
<div class="tab-content pt0">
{if $feedback->position eq 'base' && $enablecomments}
<div id="comment-form" role="tabpanel" class="tab-pane active">
{$addfeedbackform|safe}
</div>
{if $LOGGEDIN}
<div id="report-form" role="tabpanel" class="tab-pane">
{$objectionform|safe}
</div>
{/if}
{else}
{if $LOGGEDIN}
<div id="report-form" role="tabpanel" class="tab-pane active">
{$objectionform|safe}
</div>
{/if}
{/if}
</div>
</div>
</div>
{if $addfeedbackform}<div>{$addfeedbackform|safe}</div>{/if}
{if $objectionform}<div>{$objectionform|safe}</div>{/if}
</div>
</div>
{if $visitstring}<div class="ctime center s">{$visitstring}</div>{/if}
{if $microheaders}{include file="microfooter.tpl"}{else}{include file="footer.tpl"}{/if}
{if $visitstring}
<div class="ctime center s">
{$visitstring}
</div>
{/if}
{include file="footer.tpl"}
{if $LOGGEDIN}
<a id="objection_link" class="objection" href="">{str tag=reportobjectionablematerial}</a>
{/if}
<a id="print_link" class="print" href="" onclick="window.print(); return false;">{str tag=print section=view}</a>
{if $LOGGEDIN}
<a id="toggle_watchlist_link" class="watchlist" href="">{if $viewbeingwatched}{str tag=removefromwatchlist section=view}{else}{str tag=addtowatchlist section=view}{/if}</a>
{contextualhelp plugintype='core' pluginname='view' section='viewmenu'}
{/if}
<div class="pull-right">
{contextualhelp plugintype='core' pluginname='view' section='viewmenu'}
</div>
<ul class="nav nav-tabs ">
{if $feedback->position eq 'base' && $enablecomments}
<li class="active">
<a id="add_feedback_link" class="feedback" href="#comment-form" aria-controls="comment-form" role="tab" data-toggle="tab">
<span class="fa fa-lg fa-comments prm"></span>
{str tag=Comment section=artefact.comment}
</a>
</li>
{if $LOGGEDIN}
<li>
<a id="objection_link" class="objection" href="#report-form" role="tab" aria-controls="report-form" data-toggle="tab">
<span class="fa fa-lg fa-flag prs"></span>
{str tag=reportobjectionablematerial}
</a>
</li>
{/if}
{else}
{if $LOGGEDIN}
<li class="active">
<a id="objection_link" class="objection" href="#report-form" role="tab" aria-controls="report-form" data-toggle="tab">
<span class="fa fa-lg fa-flag prs"></span>
{str tag=reportobjectionablematerial}
</a>
</li>
{/if}
{/if}
</ul>
<div class="text-right btn-top-right btn-group btn-group-top pull-right">
{if $LOGGEDIN}
<a id="toggle_watchlist_link" class="watchlist btn btn-sm btn-default" href="">
{if $viewbeingwatched}
<span class="fa fa-eye-slash prs"></span>
{str tag=removefromwatchlist section=view}
{else}
<span class="fa fa-eye prs"></span>
{str tag=addtowatchlist section=view}
{/if}
</a>
{/if}
<a id="print_link" class="print btn btn-sm btn-default" href="" onclick="window.print(); return false;">
<span class="fa fa-lg fa-print prs"></span>
{str tag=print section=view}
</a>
</div>
......@@ -28,9 +28,9 @@
<a id="toggle_watchlist_link" class="watchlist btn btn-sm btn-default" href="">
{if $viewbeingwatched}
<span class="fa fa-eye-slash prs"></span>
<span class="fa fa-eye-slash prs"></span>
{else}
<span class="fa fa-eye prs"></span>
<span class="fa fa-eye prs"></span>
{/if}
{if $artefact}
......
......@@ -41,7 +41,7 @@ $filterform = pieform(array(
'name' => 'filter',
'checkdirtychange' => false,
'renderer' => 'div',
'class' => 'form-inline',
'class' => 'form-inline ptl pbl',
'elements' => array(
'inputgroup' => array(
'type' => 'fieldset',
......
......@@ -57,7 +57,7 @@ $form = pieform(array(
'elements' => array(
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn btn-danger',
'class' => 'btn btn-default',
'value' => array(get_string('yes'), get_string('no')),
'goto' => get_config('wwwroot') . 'view/' . $goto,
)
......
......@@ -84,12 +84,12 @@ $searchform = pieform(array(
'checkdirtychange' => false,
'dieaftersubmit' => false,
'renderer' => 'div',
'class' => 'search form-inline',
'class' => 'search',
'elements' => array(
'inputgroup' => array(
'type' => 'fieldset',
'title' => get_string('Query') . ': ',
'class' => 'input-group',
'class' => 'input-group form-inline',
'elements' => array(
'query' => array(
'type' => 'text',
......@@ -106,7 +106,7 @@ $searchform = pieform(array(
'advanced' => array(
'type' => 'fieldset',
'legend' => get_string('moreoptions', 'view'),
'class' => 'advanced form-inline last',
'class' => 'advanced last',
'collapsible' => true,
'collapsed' => true,
'elements' => array(
......
......@@ -132,6 +132,7 @@ if ($USER->is_logged_in() && $submittedgroup && group_user_can_assess_submitted_
$releaseform = pieform(array(
'name' => 'releaseview',
'method' => 'post',
'class' => 'form-inline',
'plugintype' => 'core',
'pluginname' => 'view',
'autofocus' => false,
......@@ -142,6 +143,7 @@ if ($USER->is_logged_in() && $submittedgroup && group_user_can_assess_submitted_
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-default',
'value' => $releasecollection ? get_string('releasecollection', 'group') : get_string('releaseview', 'group'),
),
),
......
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