Skip to content

GitLab

mahara
mahara
Commit 23c87fd8 authored by Pat Kira's avatar Pat Kira Committed by Aaron Wells
Browse files
Options

Blocktype comment view (bootstrap) 

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I5d46d34bea4661ca7a6a680ea29a4b37f3e0e685
parent 73e9e799
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 96 deletions
htdocs/artefact/internal/blocktype/socialprofile/lib.php
View file @ 23c87fd8
......@@ -85,7 +85,7 @@ class PluginBlocktypeSocialprofile extends PluginBlocktype {
'type' => 'fieldset',
'collapsible' => true,
'collapsed' => true,
'class' => 'first last',
'class' => 'first last ptl',
'legend' => get_string('displaysettings', 'blocktype.internal/socialprofile'),
'elements' => array(
'displaytype' => array(
......
htdocs/lib/group.php
View file @ 23c87fd8
......@@ -1386,7 +1386,7 @@ function group_view_submission_form($groupid) {
),
'text2' => array(
'type' => 'html',
'class' => 'forassessment text-small',
'class' => 'forassessment inline text-small',
'value' => get_string('forassessment', 'view'),
),
'inputgroup' => array(
......
htdocs/lib/view.php
View file @ 23c87fd8
......@@ -6289,7 +6289,7 @@ function view_group_submission_form($view, $tutorgroupdata, $returnto=null) {
'name' => 'view_group_submission_form_' . $viewid,
'method' => 'post',
'renderer' => 'div',
'class' => 'form-inline ptl pbl',
'class' => 'form-inline',
'autofocus' => false,
'successcallback' => 'view_group_submission_form_submit',
'elements' => array(
......
htdocs/lib/web.php
View file @ 23c87fd8
......@@ -3775,7 +3775,7 @@ function build_pagination($params) {
}
// Begin building the output
$output = '<div id="' . $params['id'] . '" class="pagination-wrapper ptl';
$output = '<div id="' . $params['id'] . '" class="pagination-wrapper';
if (isset($params['class'])) {
$output .= ' ' . hsc($params['class']);
}
......
htdocs/theme/bootstrap/artefact/blog/blocktype/blogpost/templates/blogpost.tpl
View file @ 23c87fd8
{$html|safe}
{if $commentcount || $commentcount === '0'}
{$comments|safe}
{/if}
\ No newline at end of file
{$comments|safe}
\ No newline at end of file
htdocs/theme/bootstrap/artefact/blog/templates/posts.tpl
View file @ 23c87fd8
......@@ -21,7 +21,8 @@
</span>
{if $post->locked}
<span>
<span class="text-muted plm">
<span class="fa fa-lock prs"></span>
{str tag=submittedforassessment section=view}
</span>
{else}
......
htdocs/theme/bootstrap/artefact/file/blocktype/folder/templates/folder.tpl
View file @ 23c87fd8
{if $html}{$html|safe}{/if}{if $commentcount || $commentcount === '0'}{$comments|safe}{/if}
{if $html}
{$html|safe}
{/if}
{$comments|safe}
htdocs/theme/bootstrap/artefact/file/blocktype/gallery/templates/slideshow.tpl
View file @ 23c87fd8
......@@ -29,6 +29,5 @@
{str tag=noimagesfound section=artefact.file}
{/if}
</div>
{if $commentcount || $commentcount === 0}
{$comments|safe}
{/if}
htdocs/theme/bootstrap/artefact/file/blocktype/gallery/templates/squarethumbs.tpl
View file @ 23c87fd8
......@@ -18,6 +18,4 @@
</div>
{/if}
{if $commentcount || $commentcount === 0}
{$comments|safe}
{/if}
htdocs/theme/bootstrap/artefact/file/blocktype/gallery/templates/thumbnails.tpl
View file @ 23c87fd8
......@@ -19,6 +19,4 @@
</div>
{/if}
{if $commentcount || $commentcount === 0}
{$comments|safe}
{/if}
htdocs/theme/bootstrap/artefact/file/blocktype/html/templates/html.tpl
View file @ 23c87fd8
<div class="panel-body">
{$html|safe}
</div>
{if $commentcount || $commentcount === '0'}
{$comments|safe}
{/if}
htdocs/theme/bootstrap/artefact/file/blocktype/image/templates/image.tpl
View file @ 23c87fd8
......@@ -11,6 +11,5 @@
</div>
{/if}
</div>
{if $commentcount || $commentcount === 0}
{$comments|safe}
{/if}
{$comments|safe}
htdocs/theme/bootstrap/artefact/file/blocktype/internalmedia/templates/internalmedia.tpl
View file @ 23c87fd8
{$html|safe}
{if $commentcount || $commentcount === '0'}
{$comments|safe}
{/if}
htdocs/theme/bootstrap/artefact/file/blocktype/pdf/templates/pdfrender.tpl
View file @ 23c87fd8
<div class="panel-body">
{$html|safe}
</div>
{if $commentcount || $commentcount === '0'}
{$comments|safe}
{/if}
htdocs/theme/bootstrap/artefact/file/templates/folder_render_self.tpl
View file @ 23c87fd8
......@@ -62,7 +62,9 @@
</a>
{/if}
{else}
{str tag=emptyfolder section=artefact.file}
<span class="text-thin">
{str tag=emptyfolder section=artefact.file}
</span>
{/if}
</div>
</div>
......
htdocs/theme/bootstrap/artefact/internal/blocktype/textbox/templates/content.tpl
View file @ 23c87fd8
......@@ -42,8 +42,4 @@
</div>
{/if}
<div class="mtm">
{if $commentcount || $commentcount === 0}
{$comments|safe}
{/if}
</div>
{$comments|safe}
htdocs/theme/bootstrap/artefact/internal/templates/notes.tpl
View file @ 23c87fd8
......@@ -2,22 +2,24 @@
<p class="lead">{str tag=notesdescription1 section=artefact.internal}</p>
<div class="table-responsive">
<table id="notes" class="table">
<tr>
<th>{str tag=Note section=artefact.internal}</th>
<th>{str tag=currenttitle section=artefact.internal}</th>
<th>{str tag=containedin section=artefact.internal}</th>
<th class="text-center">
<span class="fa fa-paperclip"></span>
<span class="sr-only">
{str tag=Attachments section=artefact.resume}
</span>
</th>
<th>
<span class="accessible-hidden sr-only">
{str tag=edit}
</span>
</th>
</tr>
<thead>
<tr>
<th>{str tag=Note section=artefact.internal}</th>
<th>{str tag=currenttitle section=artefact.internal}</th>
<th>{str tag=containedin section=artefact.internal}</th>
<th class="text-center">
<span class="fa fa-paperclip"></span>
<span class="sr-only">
{str tag=Attachments section=artefact.resume}
</span>
</th>
<th>
<span class="accessible-hidden sr-only">
{str tag=edit}
</span>
</th>
</tr>
</thead>
<tbody>
{foreach from=$data item=n}
<tr class="{cycle values='r1,r0'}">
......
htdocs/theme/bootstrap/interaction/forum/templates/topics.tpl
View file @ 23c87fd8
......@@ -47,15 +47,15 @@
{$topic->postcount}
</td>
<td class="lastposttd metadata">
{if !$topic->lastpostdeleted}
<a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}&post{$topic->lastpost}">
{$topic->lastposttime}
</a>
{if $publicgroup}
<a href="{$topic->feedlink}" class="pls">
<span class="fa-rss fa text-orange"></span>
</a>
{/if}
{if !$topic->lastpostdeleted}
<a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}&post{$topic->lastpost}">
{$topic->lastposttime}
</a>
{if $publicgroup}
<a href="{$topic->feedlink}" class="pls">
<span class="fa-rss fa text-orange"></span>
</a>
{/if}
<p>
{str tag=by section=view}
<a href="{profile_url($topic->lastposter)}" {if in_array($topic->lastposter, $groupadmins)} class="groupadmin"{elseif $topic->lastpostermoderator} class="moderator"{/if}>{$topic->lastposter|display_name:null:true}
......@@ -66,19 +66,20 @@
</td>
<td class="control-buttons">
{if $moderator}
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-default btn-xs" title="{str tag="edit"}">
<span class="fa fa-pencil"></span>
<span class="sr-only">
{str tag=edittopicspecific section=interaction.forum arg1=$topic->subject}
</span>
</a>
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-danger btn-xs" title="{str tag="delete"}">
<span class="fa fa-trash"></span>
<span class="sr-only">
{str tag=deletetopicspecific section=interaction.forum arg1=$topic->subject}
</span>
</a>
<div class="btn-group">
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-default btn-xs" title="{str tag="edit"}">
<span class="fa fa-pencil"></span>
<span class="sr-only">
{str tag=edittopicspecific section=interaction.forum arg1=$topic->subject}
</span>
</a>
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-default btn-xs" title="{str tag="delete"}">
<span class="fa fa-trash text-danger"></span>
<span class="sr-only">
{str tag=deletetopicspecific section=interaction.forum arg1=$topic->subject}
</span>
</a>
</div>
</td>
{/if}
</tr>
......
htdocs/theme/bootstrap/static/sass/_custom.scss
View file @ 23c87fd8
......@@ -28,3 +28,7 @@
}
}
}
.blocktype-radio {
display: none;
}
htdocs/theme/bootstrap/static/sass/components/_btn-group.scss
View file @ 23c87fd8
......@@ -39,7 +39,7 @@
.btn-group .form-as-button ~ .form-as-button {
.btn {
border-left: 0;
// border-left: 0;
@include border-left-radius(0);
}
}
......
htdocs/theme/bootstrap/templates/artefact/artefactcommentsview.tpl
View file @ 23c87fd8
{if $allowcomments}
<div class="comments panel-body pt0">
{if $commentcount > 0}
<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="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}
<a class="commentlink text-thin pull-left" id="block_{$blockid}" href="{$artefacturl}">
{str tag=Comments section=artefact.comment} ({$commentcount})
</a>
</div>
{/if}
{if !$editing}
<div class="feedbacktablewrapper">
<div id="feedbacktable_{$blockid}" class="feedbacktable">
......
htdocs/theme/bootstrap/templates/view/view.tpl
View file @ 23c87fd8
......@@ -79,7 +79,7 @@
{if $feedback->position eq 'base'}
{if $feedback->count || $enablecomments}
<h3 class="title">
{str tag="comments" section="artefact.comment"}
{str tag="Comments" section="artefact.comment"}
</h3>
<div id="feedbacktable" class="feedbacktable fullwidth">
......@@ -89,10 +89,10 @@
{/if}
{/if}
<div id="viewmenu" class="view-menu ptxl pbxl">
<div id="viewmenu" class="view-menu ptxl pbl">
{include file="view/viewmenu.tpl"}
<div class="tab-content pt0">
<div class="tab-content">
{if $feedback->position eq 'base' && $enablecomments}
<div id="comment-form" role="tabpanel" class="tab-pane active">
{$addfeedbackform|safe}
......@@ -115,7 +115,7 @@
</div>
{if $visitstring}
<div class="ctime center s">
<div class="ctime s text-thin">
{$visitstring}
</div>
{/if}
......
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