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

Blocktype comment view (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I5d46d34bea4661ca7a6a680ea29a4b37f3e0e685
parent 73e9e799
...@@ -85,7 +85,7 @@ class PluginBlocktypeSocialprofile extends PluginBlocktype { ...@@ -85,7 +85,7 @@ class PluginBlocktypeSocialprofile extends PluginBlocktype {
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
'class' => 'first last', 'class' => 'first last ptl',
'legend' => get_string('displaysettings', 'blocktype.internal/socialprofile'), 'legend' => get_string('displaysettings', 'blocktype.internal/socialprofile'),
'elements' => array( 'elements' => array(
'displaytype' => array( 'displaytype' => array(
......
...@@ -1386,7 +1386,7 @@ function group_view_submission_form($groupid) { ...@@ -1386,7 +1386,7 @@ function group_view_submission_form($groupid) {
), ),
'text2' => array( 'text2' => array(
'type' => 'html', 'type' => 'html',
'class' => 'forassessment text-small', 'class' => 'forassessment inline text-small',
'value' => get_string('forassessment', 'view'), 'value' => get_string('forassessment', 'view'),
), ),
'inputgroup' => array( 'inputgroup' => array(
......
...@@ -6289,7 +6289,7 @@ function view_group_submission_form($view, $tutorgroupdata, $returnto=null) { ...@@ -6289,7 +6289,7 @@ function view_group_submission_form($view, $tutorgroupdata, $returnto=null) {
'name' => 'view_group_submission_form_' . $viewid, 'name' => 'view_group_submission_form_' . $viewid,
'method' => 'post', 'method' => 'post',
'renderer' => 'div', 'renderer' => 'div',
'class' => 'form-inline ptl pbl', 'class' => 'form-inline',
'autofocus' => false, 'autofocus' => false,
'successcallback' => 'view_group_submission_form_submit', 'successcallback' => 'view_group_submission_form_submit',
'elements' => array( 'elements' => array(
......
...@@ -3775,7 +3775,7 @@ function build_pagination($params) { ...@@ -3775,7 +3775,7 @@ function build_pagination($params) {
} }
// Begin building the output // 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'])) { if (isset($params['class'])) {
$output .= ' ' . hsc($params['class']); $output .= ' ' . hsc($params['class']);
} }
......
{$html|safe} {$html|safe}
{if $commentcount || $commentcount === '0'} {$comments|safe}
{$comments|safe} \ No newline at end of file
{/if}
\ No newline at end of file
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
</span> </span>
{if $post->locked} {if $post->locked}
<span> <span class="text-muted plm">
<span class="fa fa-lock prs"></span>
{str tag=submittedforassessment section=view} {str tag=submittedforassessment section=view}
</span> </span>
{else} {else}
......
{if $html}{$html|safe}{/if}{if $commentcount || $commentcount === '0'}{$comments|safe}{/if} {if $html}
{$html|safe}
{/if}
{$comments|safe}
...@@ -29,6 +29,5 @@ ...@@ -29,6 +29,5 @@
{str tag=noimagesfound section=artefact.file} {str tag=noimagesfound section=artefact.file}
{/if} {/if}
</div> </div>
{if $commentcount || $commentcount === 0}
{$comments|safe} {$comments|safe}
{/if}
...@@ -18,6 +18,4 @@ ...@@ -18,6 +18,4 @@
</div> </div>
{/if} {/if}
{if $commentcount || $commentcount === 0}
{$comments|safe} {$comments|safe}
{/if}
...@@ -19,6 +19,4 @@ ...@@ -19,6 +19,4 @@
</div> </div>
{/if} {/if}
{if $commentcount || $commentcount === 0}
{$comments|safe} {$comments|safe}
{/if}
<div class="panel-body"> <div class="panel-body">
{$html|safe} {$html|safe}
</div> </div>
{if $commentcount || $commentcount === '0'}
{$comments|safe} {$comments|safe}
{/if}
...@@ -11,6 +11,5 @@ ...@@ -11,6 +11,5 @@
</div> </div>
{/if} {/if}
</div> </div>
{if $commentcount || $commentcount === 0}
{$comments|safe} {$comments|safe}
{/if}
{$html|safe} {$html|safe}
{if $commentcount || $commentcount === '0'}
{$comments|safe} {$comments|safe}
{/if}
<div class="panel-body"> <div class="panel-body">
{$html|safe} {$html|safe}
</div> </div>
{if $commentcount || $commentcount === '0'}
{$comments|safe} {$comments|safe}
{/if}
...@@ -62,7 +62,9 @@ ...@@ -62,7 +62,9 @@
</a> </a>
{/if} {/if}
{else} {else}
{str tag=emptyfolder section=artefact.file} <span class="text-thin">
{str tag=emptyfolder section=artefact.file}
</span>
{/if} {/if}
</div> </div>
</div> </div>
......
...@@ -42,8 +42,4 @@ ...@@ -42,8 +42,4 @@
</div> </div>
{/if} {/if}
<div class="mtm"> {$comments|safe}
{if $commentcount || $commentcount === 0}
{$comments|safe}
{/if}
</div>
...@@ -2,22 +2,24 @@ ...@@ -2,22 +2,24 @@
<p class="lead">{str tag=notesdescription1 section=artefact.internal}</p> <p class="lead">{str tag=notesdescription1 section=artefact.internal}</p>
<div class="table-responsive"> <div class="table-responsive">
<table id="notes" class="table"> <table id="notes" class="table">
<tr> <thead>
<th>{str tag=Note section=artefact.internal}</th> <tr>
<th>{str tag=currenttitle section=artefact.internal}</th> <th>{str tag=Note section=artefact.internal}</th>
<th>{str tag=containedin section=artefact.internal}</th> <th>{str tag=currenttitle section=artefact.internal}</th>
<th class="text-center"> <th>{str tag=containedin section=artefact.internal}</th>
<span class="fa fa-paperclip"></span> <th class="text-center">
<span class="sr-only"> <span class="fa fa-paperclip"></span>
{str tag=Attachments section=artefact.resume} <span class="sr-only">
</span> {str tag=Attachments section=artefact.resume}
</th> </span>
<th> </th>
<span class="accessible-hidden sr-only"> <th>
{str tag=edit} <span class="accessible-hidden sr-only">
</span> {str tag=edit}
</th> </span>
</tr> </th>
</tr>
</thead>
<tbody> <tbody>
{foreach from=$data item=n} {foreach from=$data item=n}
<tr class="{cycle values='r1,r0'}"> <tr class="{cycle values='r1,r0'}">
......
...@@ -47,15 +47,15 @@ ...@@ -47,15 +47,15 @@
{$topic->postcount} {$topic->postcount}
</td> </td>
<td class="lastposttd metadata"> <td class="lastposttd metadata">
{if !$topic->lastpostdeleted} {if !$topic->lastpostdeleted}
<a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}&post{$topic->lastpost}"> <a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}&post{$topic->lastpost}">
{$topic->lastposttime} {$topic->lastposttime}
</a> </a>
{if $publicgroup} {if $publicgroup}
<a href="{$topic->feedlink}" class="pls"> <a href="{$topic->feedlink}" class="pls">
<span class="fa-rss fa text-orange"></span> <span class="fa-rss fa text-orange"></span>
</a> </a>
{/if} {/if}
<p> <p>
{str tag=by section=view} {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} <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 @@ ...@@ -66,19 +66,20 @@
</td> </td>
<td class="control-buttons"> <td class="control-buttons">
{if $moderator} {if $moderator}
<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"}"> <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="fa fa-pencil"></span>
<span class="sr-only"> <span class="sr-only">
{str tag=edittopicspecific section=interaction.forum arg1=$topic->subject} {str tag=edittopicspecific section=interaction.forum arg1=$topic->subject}
</span> </span>
</a> </a>
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-danger btn-xs" title="{str tag="delete"}"> <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"></span> <span class="fa fa-trash text-danger"></span>
<span class="sr-only"> <span class="sr-only">
{str tag=deletetopicspecific section=interaction.forum arg1=$topic->subject} {str tag=deletetopicspecific section=interaction.forum arg1=$topic->subject}
</span> </span>
</a> </a>
</div>
</td> </td>
{/if} {/if}
</tr> </tr>
......
...@@ -28,3 +28,7 @@ ...@@ -28,3 +28,7 @@
} }
} }
} }
.blocktype-radio {
display: none;
}
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
.btn-group .form-as-button ~ .form-as-button { .btn-group .form-as-button ~ .form-as-button {
.btn { .btn {
border-left: 0; // border-left: 0;
@include border-left-radius(0); @include border-left-radius(0);
} }
} }
......
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