Commit b037c37b authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Move make public button to the right of feedback list & change styling


Signed-off-by: default avatarRichard Mansfield <richardm@catalyst.net.nz>
parent 05a3f76a
......@@ -506,13 +506,12 @@ class ArtefactTypeComment extends ArtefactType {
return array(
'name' => 'make_public',
'renderer' => 'oneline',
'class' => 'makeprivate',
// 'jsform' => true,
'elements' => array(
'comment' => array('type' => 'hidden', 'value' => $id),
'submit' => array(
'type' => 'submit',
'name' => 'make_public_submit',
'type' => 'submit',
'class' => 'quiet',
'name' => 'make_public_submit',
'value' => get_string('makepublic', 'artefact.comment'),
),
),
......@@ -523,12 +522,11 @@ class ArtefactTypeComment extends ArtefactType {
return array(
'name' => 'delete_comment',
'renderer' => 'oneline',
'class' => 'makeprivate',
'elements' => array(
'comment' => array('type' => 'hidden', 'value' => $id),
'submit' => array(
'type' => 'submit',
'class' => 'delete',
'class' => 'quiet btn-del',
'name' => 'delete_comment_submit',
'value' => get_string('delete'),
),
......
......@@ -8,7 +8,10 @@
{if $item->attachmessage}<div>{$item->attachmessage}</div>{/if}
{/if}
<div class="details">
{if $item->deleteform}<div class="fr">{$item->deleteform}</div>{/if}
<div class="fr">
{if $item->makepublicform}{$item->makepublicform}{/if}
{if $item->deleteform}{$item->deleteform}{/if}
</div>
{if $item->author}
<div class="icon"><a href="{$WWWROOT}user/view.php?id={$item->author->id|escape}">
<img src="{profile_icon_url user=$item->author maxheight=20 maxwidth=20}" valign="middle" alt="{$item->author|display_name}">
......@@ -21,11 +24,8 @@
| {$item->deletedmessage|escape}
{else}
| {$item->date|escape}
{if $item->pubmessage}
| {$item->pubmessage|escape}
{if $item->makepublicform}{$item->makepublicform}{/if}
{if $item->makepublicrequested} | {str tag=youhaverequestedpublic section=artefact.comment}{/if}
{/if}
{if $item->pubmessage} | {$item->pubmessage|escape}{/if}
{if $item->makepublicrequested} | {str tag=youhaverequestedpublic section=artefact.comment}{/if}
{strip}
{foreach $item->attachments item=a name=attachments}
{if $.foreach.attachments.first} | {str tag=Attachments section=artefact.comment}:{else},{/if} <a href="{$WWWROOT}artefact/file/download.php?file={$a->attachid}">{$a->attachtitle|escape}</a> ({$a->attachsize|escape})
......
......@@ -196,6 +196,14 @@ input.btn-del:active {
border-color: #611700 #eda58c #eda58c #611700 !important;
background: #A82700 !important;
}
input.quiet {
background: none !important;
color: #6e8e00;
}
input.quiet.btn-del {
background: none !important;
color: #ca0000 !important;
}
/** link buttons **/
.rbuttons a.btn,
......
......@@ -526,8 +526,8 @@ div.artefactchooser-splitter {
#feedback_pagination {
margin: 0;
}
#feedbacktable form.makeprivate,
#feedbacktable form.makeprivate div {
#feedbacktable form,
#feedbacktable form div {
display: inline;
}
#add_feedback_form {
......
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