Commit fd095185 authored by Evan Goldenberg's avatar Evan Goldenberg Committed by Francois Marier
Browse files

usability: clearly distinguish buttons in view editor and logged in box



Logged-in box:

- Style (i.e. different colour) the logout button differently

In the view editor:

- Style (i.e. colours) the cancel/prev and next/submit buttons differently.
- Expand the descriptive text above the preview area.
Signed-off-by: default avatarEvan Goldenberg <evang@catalyst.net.nz>
Signed-off-by: default avatarFrancois Marier <francois@catalyst.net.nz>
parent 2dd8c2aa
...@@ -182,6 +182,7 @@ $deleteall = pieform(array( ...@@ -182,6 +182,7 @@ $deleteall = pieform(array(
'type' => 'submit', 'type' => 'submit',
'value' => get_string('deleteallnotifications', 'activity'), 'value' => get_string('deleteallnotifications', 'activity'),
'confirm' => get_string('reallydeleteallnotifications', 'activity'), 'confirm' => get_string('reallydeleteallnotifications', 'activity'),
'class' => 'btn-del',
), ),
), ),
)); ));
......
...@@ -197,7 +197,7 @@ $string['confirmdeleteblockinstance'] = 'Are you sure you wish to delete this bl ...@@ -197,7 +197,7 @@ $string['confirmdeleteblockinstance'] = 'Are you sure you wish to delete this bl
$string['blockinstanceconfiguredsuccessfully'] = 'Block configured successfully'; $string['blockinstanceconfiguredsuccessfully'] = 'Block configured successfully';
$string['blocksintructionnoajax'] = 'Select a block and choose where to add it to your View. You can position a block using the arrow buttons in its titlebar'; $string['blocksintructionnoajax'] = 'Select a block and choose where to add it to your View. You can position a block using the arrow buttons in its titlebar';
$string['blocksinstructionajax'] = 'Drag blocks below this line to add them to your View layout. You can drag blocks around your View layout to position them.'; $string['blocksinstructionajax'] = 'This area shows a preview of what your View will look like.<br>Drag blocks below this line to add them to your View layout. You can drag blocks around your View layout to position them.';
$string['addnewblockhere'] = 'Add new block here'; $string['addnewblockhere'] = 'Add new block here';
$string['add'] = 'Add'; $string['add'] = 'Add';
......
...@@ -176,6 +176,27 @@ input#files_filebrowser_edit_artefact { ...@@ -176,6 +176,27 @@ input#files_filebrowser_edit_artefact {
background: #6e8e00; background: #6e8e00;
color: #FFF; color: #FFF;
} }
#btn-logout,
#buttons_delete,
input.cancel,
input.btn-del {
border-color: #eda58c #611700 #611700 #eda58c !important;
background: #8f2100 !important;
}
#btn-logout:hover,
#buttons_delete:hover,
input.cancel:hover,
input.btn-del:hover {
background: #A82700 !important;
}
#btn-logout:active,
#buttons_delete:active,
input.cancel:active,
input.btn-del:active {
border-color: #611700 #eda58c #eda58c #611700 !important;
background: #A82700 !important;
}
/** link buttons **/ /** link buttons **/
.rbuttons a.btn, .rbuttons a.btn,
#sb-profile .controls a, #sb-profile .controls a,
......
...@@ -757,6 +757,7 @@ div.info { ...@@ -757,6 +757,7 @@ div.info {
div.ok { div.ok {
color: #547c22; color: #547c22;
background: #e7f1c3 url(../images/success.gif) no-repeat .5em; background: #e7f1c3 url(../images/success.gif) no-repeat .5em;
border: 1px solid #547c22;
} }
#messages .error, #messages .error,
div.error { div.error {
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
/********************** Bottom pane of Edit View *************************/ /********************** Bottom pane of Edit View *************************/
#page #bottom-pane { #page #bottom-pane {
border: 5px solid #eee; border: 5px solid #ccc;
} }
#blocksinstruction { #blocksinstruction {
background: #eee; background: #eee;
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
#block-placeholder { #block-placeholder {
border: 2px dashed #bfbfbf; border: 2px dashed #bfbfbf;
margin-bottom: 2px;
} }
/**************** Blockinstance **********************/ /**************** Blockinstance **********************/
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<form action="" method="POST"> <form action="" method="POST">
<input type="hidden" name="id" value="{$view}"> <input type="hidden" name="id" value="{$view}">
<input type="hidden" name="new" value="1"> <input type="hidden" name="new" value="1">
<input type="submit" name="cancel" class="submit" value="{str tag='cancel'}" onclick="return confirm('{str tag='confirmcancelcreatingview' section='view'}');"> <input type="submit" name="cancel" class="cancel" value="{str tag='cancel'}" onclick="return confirm('{str tag='confirmcancelcreatingview' section='view'}');">
</form> </form>
<form action="{$WWWROOT}view/edit.php" method="GET"> <form action="{$WWWROOT}view/edit.php" method="GET">
<input type="hidden" name="id" value="{$view}"> <input type="hidden" name="id" value="{$view}">
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<input type="image" src="{theme_url filename='images/move-block-`$item.dir`.png'}" class="submit movebutton" name="action_moveblockinstance_id_{$id}_column_{$item.column}_order_{$item.order}" alt="{$item.arrow}" title="{$item.title}"> <input type="image" src="{theme_url filename='images/move-block-`$item.dir`.png'}" class="submit movebutton" name="action_moveblockinstance_id_{$id}_column_{$item.column}_order_{$item.order}" alt="{$item.arrow}" title="{$item.title}">
{/foreach} {/foreach}
{if $configurable && !$configure} <input type="image" src="{theme_url filename=images/configure-block.png}" class="submit configurebutton" name="action_configureblockinstance_id_{$id}" alt="&bull;" title="{$strconfigtitletext|escape}">{/if} {if $configurable && !$configure} <input type="image" src="{theme_url filename=images/configure-block.png}" class="submit configurebutton" name="action_configureblockinstance_id_{$id}" alt="&bull;" title="{$strconfigtitletext|escape}">{/if}
<input type="image" src="{theme_url filename=images/remove-block.png}" class="cancel deletebutton" name="action_removeblockinstance_id_{$id}" alt="X" title="{$strremovetitletext|escape}"> <input type="image" src="{theme_url filename=images/remove-block.png}" class="deletebutton" name="action_removeblockinstance_id_{$id}" alt="X" title="{$strremovetitletext|escape}">
</div> </div>
<div class="blockinstance-content"> <div class="blockinstance-content">
{$content} {$content}
......
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