Commit cfde5745 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells

Admin (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework
Admin area
File browser fixes
Style resume pages excluding collapsible elements

Change-Id: Ica76a112b6fcf589f34bcb667ecc1cf426bd7339
parent fbd59ac7
...@@ -115,6 +115,7 @@ function license_submit(Pieform $form, $values) { ...@@ -115,6 +115,7 @@ function license_submit(Pieform $form, $values) {
$smarty = smarty(); $smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('enabled', get_config('licensemetadata')); $smarty->assign('enabled', get_config('licensemetadata'));
$smarty->display('admin/site/license-edit.tpl'); $smarty->display('admin/site/license-edit.tpl');
...@@ -44,6 +44,7 @@ $extralicenses = get_column_sql(" ...@@ -44,6 +44,7 @@ $extralicenses = get_column_sql("
$smarty = smarty(); $smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEICON', 'fa fa-legal');
$smarty->assign('licenses', $licenses); $smarty->assign('licenses', $licenses);
$smarty->assign('extralicenses', $extralicenses); $smarty->assign('extralicenses', $extralicenses);
$smarty->assign('enabled', get_config('licensemetadata')); $smarty->assign('enabled', get_config('licensemetadata'));
......
...@@ -283,6 +283,7 @@ foreach ($all as $k => $v) { ...@@ -283,6 +283,7 @@ foreach ($all as $k => $v) {
); );
} }
$footerelements['submit'] = array( $footerelements['submit'] = array(
'class' => 'btn btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('savechanges', 'admin') 'value' => get_string('savechanges', 'admin')
); );
...@@ -324,5 +325,6 @@ $smarty->assign('INLINEJAVASCRIPT', $ijs); ...@@ -324,5 +325,6 @@ $smarty->assign('INLINEJAVASCRIPT', $ijs);
$smarty->assign('MENUS', $menulist); $smarty->assign('MENUS', $menulist);
$smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'artefact/file/sitefiles.php">', '</a>')); $smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'artefact/file/sitefiles.php">', '</a>'));
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEICON', 'fa fa-bars');
$smarty->assign('footerform', $footerform); $smarty->assign('footerform', $footerform);
$smarty->display('admin/site/menu.tpl'); $smarty->display('admin/site/menu.tpl');
...@@ -28,6 +28,8 @@ $xmlrpcext = extension_loaded('xmlrpc'); ...@@ -28,6 +28,8 @@ $xmlrpcext = extension_loaded('xmlrpc');
if (!$opensslext || !$curlext || !$xmlrpcext) { if (!$opensslext || !$curlext || !$xmlrpcext) {
$smarty = smarty(); $smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEICON', 'fa fa-exchange');
$missingextensions = array(); $missingextensions = array();
!$opensslext && $missingextensions[] = 'openssl'; !$opensslext && $missingextensions[] = 'openssl';
!$curlext && $missingextensions[] = 'curl'; !$curlext && $missingextensions[] = 'curl';
...@@ -89,10 +91,12 @@ $networkingform = pieform( ...@@ -89,10 +91,12 @@ $networkingform = pieform(
'options' => $yesno, 'options' => $yesno,
), ),
'submit' => array( 'submit' => array(
'class' => 'btn btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('savechanges','admin') 'value' => get_string('savechanges','admin')
), ),
'deletesubmit' => array( 'deletesubmit' => array(
'class' => 'btn btn-danger',
'type' => 'submit', 'type' => 'submit',
'title' => get_string('deletekey', 'admin'), 'title' => get_string('deletekey', 'admin'),
'value' => get_string('delete') 'value' => get_string('delete')
...@@ -158,5 +162,6 @@ function networkingform_submit(Pieform $form, $values) { ...@@ -158,5 +162,6 @@ function networkingform_submit(Pieform $form, $values) {
$smarty = smarty(); $smarty = smarty();
$smarty->assign('networkingform', $networkingform); $smarty->assign('networkingform', $networkingform);
$smarty->assign('PAGEICON', 'fa fa-exchange');
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/networking.tpl'); $smarty->display('admin/site/networking.tpl');
...@@ -46,6 +46,7 @@ $siteoptionform = array( ...@@ -46,6 +46,7 @@ $siteoptionform = array(
'jssuccesscallback' => 'checkReload', 'jssuccesscallback' => 'checkReload',
'elements' => array( 'elements' => array(
'sitesettings' => array( 'sitesettings' => array(
'iconclass' => 'globe',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -113,6 +114,7 @@ $siteoptionform = array( ...@@ -113,6 +114,7 @@ $siteoptionform = array(
), ),
), ),
'usersettings' => array( 'usersettings' => array(
'iconclass' => 'user',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -228,6 +230,7 @@ $siteoptionform = array( ...@@ -228,6 +230,7 @@ $siteoptionform = array(
), ),
), ),
'searchsettings' => array( 'searchsettings' => array(
'iconclass' => 'search',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -246,6 +249,7 @@ $siteoptionform = array( ...@@ -246,6 +249,7 @@ $siteoptionform = array(
), ),
), ),
'groupsettings' => array( 'groupsettings' => array(
'iconclass' => 'users',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -285,6 +289,7 @@ $siteoptionform = array( ...@@ -285,6 +289,7 @@ $siteoptionform = array(
), ),
), ),
'institutionsettings' => array( 'institutionsettings' => array(
'iconclass' => 'university',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -323,6 +328,7 @@ $siteoptionform = array( ...@@ -323,6 +328,7 @@ $siteoptionform = array(
), ),
), ),
'accountsettings' => array( 'accountsettings' => array(
'iconclass'=>'clock-o',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -386,6 +392,7 @@ $siteoptionform = array( ...@@ -386,6 +392,7 @@ $siteoptionform = array(
), ),
), ),
'securitysettings' => array( 'securitysettings' => array(
'iconclass'=>'lock',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -465,6 +472,7 @@ $siteoptionform = array( ...@@ -465,6 +472,7 @@ $siteoptionform = array(
), ),
# TODO: this should become "Network Settings" at some point # TODO: this should become "Network Settings" at some point
'proxysettings' => array( 'proxysettings' => array(
'iconclass'=>'exchange',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -498,6 +506,7 @@ $siteoptionform = array( ...@@ -498,6 +506,7 @@ $siteoptionform = array(
), ),
), ),
'emailsettings' => array( 'emailsettings' => array(
'iconclass'=>'envelope',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -556,6 +565,7 @@ $siteoptionform = array( ...@@ -556,6 +565,7 @@ $siteoptionform = array(
), ),
), ),
'notificationsettings' => array( 'notificationsettings' => array(
'iconclass'=>'bell',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -571,6 +581,7 @@ $siteoptionform = array( ...@@ -571,6 +581,7 @@ $siteoptionform = array(
$notificationelements), $notificationelements),
), ),
'generalsettings' => array( 'generalsettings' => array(
'iconclass'=>'cog',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -713,6 +724,8 @@ $siteoptionform = array( ...@@ -713,6 +724,8 @@ $siteoptionform = array(
), ),
), ),
'loggingsettings' => array( 'loggingsettings' => array(
'iconclass'=>'exclamation-triangle',
'class' => 'last',
'type' => 'fieldset', 'type' => 'fieldset',
'collapsible' => true, 'collapsible' => true,
'collapsed' => true, 'collapsed' => true,
...@@ -746,6 +759,7 @@ $siteoptionform = array( ...@@ -746,6 +759,7 @@ $siteoptionform = array(
$siteoptionform['elements']['submit'] = array( $siteoptionform['elements']['submit'] = array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success mtm',
'value' => get_string('updatesiteoptions', 'admin') 'value' => get_string('updatesiteoptions', 'admin')
); );
...@@ -956,5 +970,6 @@ $thispage = json_encode(get_config('wwwroot') . 'admin/site/options.php'); ...@@ -956,5 +970,6 @@ $thispage = json_encode(get_config('wwwroot') . 'admin/site/options.php');
$smarty = smarty(array('adminsiteoptions')); $smarty = smarty(array('adminsiteoptions'));
$smarty->assign('siteoptionform', $siteoptionform); $smarty->assign('siteoptionform', $siteoptionform);
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEICON', 'fa fa-cogs');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->display('admin/site/options.tpl'); $smarty->display('admin/site/options.tpl');
...@@ -65,6 +65,7 @@ $form = pieform(array( ...@@ -65,6 +65,7 @@ $form = pieform(array(
) )
), ),
'submit' => array( 'submit' => array(
'class' => 'btn btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('savechanges', 'admin') 'value' => get_string('savechanges', 'admin')
), ),
...@@ -91,5 +92,6 @@ function editsitepage_submit(Pieform $form, $values) { ...@@ -91,5 +92,6 @@ function editsitepage_submit(Pieform $form, $values) {
$smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits'))); $smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits')));
$smarty->assign('pageeditform', $form); $smarty->assign('pageeditform', $form);
$smarty->assign('PAGEICON', 'fa fa-pencil');
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/pages.tpl'); $smarty->display('admin/site/pages.tpl');
...@@ -19,6 +19,7 @@ define('TITLE', get_string('share', 'view')); ...@@ -19,6 +19,7 @@ define('TITLE', get_string('share', 'view'));
$accesslists = View::get_accesslists(null, null, 'mahara'); $accesslists = View::get_accesslists(null, null, 'mahara');
$smarty = smarty(); $smarty = smarty();
$smarty->assign('PAGEICON', 'fa fa-key');
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('accesslists', $accesslists); $smarty->assign('accesslists', $accesslists);
$smarty->display('view/share.tpl'); $smarty->display('view/share.tpl');
...@@ -60,6 +60,7 @@ $createviewform = pieform(create_view_form(null, 'mahara')); ...@@ -60,6 +60,7 @@ $createviewform = pieform(create_view_form(null, 'mahara'));
$smarty = smarty(array('paginator')); $smarty = smarty(array('paginator'));
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEICON', 'fa fa-file-text');
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('views', $views); $smarty->assign('views', $views);
$smarty->assign('institution', 'mahara'); $smarty->assign('institution', 'mahara');
......
...@@ -494,7 +494,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) { ...@@ -494,7 +494,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
return false; return false;
} }
}); });
ul.append($j('<li><span class="fa fa-share-alt prm"></span>').append(link)); ul.append($j('<li><span class="fa fa-folder prm"></span>').append(link));
} }
else { else {
movefoldercount --; movefoldercount --;
...@@ -606,12 +606,13 @@ function FileBrowser(idprefix, folderid, config, globalconfig) { ...@@ -606,12 +606,13 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
setStyle(elem, { setStyle(elem, {
'position': 'absolute', 'position': 'absolute',
'border': '2px solid #aaa'
}); });
setElementDimensions(elem, dimensions); setElementDimensions(elem, dimensions);
} }
}, },
// This is actually an 'ondragfail' methodm, rather than a user revert
revert: function (element) { revert: function (element) {
if (self.drag.clone) { if (self.drag.clone) {
removeElement(element); removeElement(element);
forEach(Draggables.drags, function(drag) { forEach(Draggables.drags, function(drag) {
...@@ -620,7 +621,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) { ...@@ -620,7 +621,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
} }
}); });
element = null; element = null;
self.make_icon_draggable(self.drag.clone); // /self.make_icon_draggable(self.drag.clone);
self.drag = {}; self.drag = {};
} }
} }
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
// set up the dropzone // set up the dropzone
jQuery(document).ready(function() { jQuery(document).ready(function() {
// to avoid any clashes with other javascript // to avoid any clashes with other javascript
var j = jQuery.noConflict(); var j = jQuery.noConflict();
// turn on the 'drop file here' area for browsers that can handle it. // turn on the 'drop file here' area for browsers that can handle it.
......
...@@ -26,6 +26,7 @@ $js = ArtefactTypeFileBase::files_js(); ...@@ -26,6 +26,7 @@ $js = ArtefactTypeFileBase::files_js();
$smarty = smarty(); $smarty = smarty();
$smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'admin/site/menu.php">', '</a>')); $smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'admin/site/menu.php">', '</a>'));
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEICON', 'fa fa-file-image-o');
$smarty->assign('institution', 'mahara'); $smarty->assign('institution', 'mahara');
$smarty->assign('form', $form); $smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $js); $smarty->assign('INLINEJAVASCRIPT', $js);
......
...@@ -76,6 +76,7 @@ $elements['filebrowser'] = array( ...@@ -76,6 +76,7 @@ $elements['filebrowser'] = array(
// Add other necessary pieform elements // Add other necessary pieform elements
$elements['submitform'] = array( $elements['submitform'] = array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-success',
'value' => array(get_string('save'), get_string('cancel')), 'value' => array(get_string('save'), get_string('cancel')),
'goto' => get_config('wwwroot') . 'artefact/resume/' . $tabs[$type] . '.php', 'goto' => get_config('wwwroot') . 'artefact/resume/' . $tabs[$type] . '.php',
); );
......
...@@ -108,6 +108,7 @@ $form = pieform(array( ...@@ -108,6 +108,7 @@ $form = pieform(array(
), ),
'submitform' => array( 'submitform' => array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-success',
'value' => array(get_string('save'), get_string('cancel')), 'value' => array(get_string('save'), get_string('cancel')),
'goto' => get_config('wwwroot') . 'artefact/resume/goalsandskills.php', 'goto' => get_config('wwwroot') . 'artefact/resume/goalsandskills.php',
), ),
......
...@@ -955,10 +955,12 @@ function toggleCompositeForm(type) { ...@@ -955,10 +955,12 @@ function toggleCompositeForm(type) {
if (elem.hasClass('hidden')) { if (elem.hasClass('hidden')) {
elem.removeClass('hidden'); elem.removeClass('hidden');
elem.find(':input').first().focus(); elem.find(':input').first().focus();
\$j('#add' + type + 'button').html({$cancelstr}); \$j('#add' + type + 'button').removeClass('btn-success');
\$j('#add' + type + 'button').addClass('btn-danger').html({$cancelstr});
} }
else { else {
\$j('#add' + type + 'button').html({$addstr}); \$j('#add' + type + 'button').removeClass('btn-danger');
\$j('#add' + type + 'button').addClass('btn-success').html({$addstr});
elem.addClass('hidden'); elem.addClass('hidden');
} }
} }
...@@ -1022,7 +1024,7 @@ EOF; ...@@ -1022,7 +1024,7 @@ EOF;
e.stop(); e.stop();
return showhideComposite(r, {$bodystring}, {$attachstring}); return showhideComposite(r, {$bodystring}, {$attachstring});
}); });
var extra = DIV(null, {$extrastring}); var extra = DIV({'class': 'detail'}, {$extrastring});
return TD({'id': 'composite-' + r.artefact + '-' + r.id}, DIV({'class': 'expandable-head'}, link, extra)); return TD({'id': 'composite-' + r.artefact + '-' + r.id}, DIV({'class': 'expandable-head'}, link, extra));
}, },
"; ";
...@@ -1084,7 +1086,10 @@ EOF; ...@@ -1084,7 +1086,10 @@ EOF;
function (r, d) { function (r, d) {
var buttons = []; var buttons = [];
if (r._rownumber > 1) { if (r._rownumber > 1) {
var up = A({'href': ''}, IMG({'src': {$imagemoveblockup}, 'alt':'{$upstr}'})); var up =
A({'href': '', 'class': 'btn btn-default btn-xs'},
SPAN({'class': 'fa fa-arrow-up'}),
SPAN({'class': 'sr-only'}, '{$upstr}'));
connect(up, 'onclick', function (e) { connect(up, 'onclick', function (e) {
e.stop(); e.stop();
return moveComposite(d.type, r.id, r.artefact, 'up'); return moveComposite(d.type, r.id, r.artefact, 'up');
...@@ -1092,7 +1097,10 @@ EOF; ...@@ -1092,7 +1097,10 @@ EOF;
buttons.push(up); buttons.push(up);
} }
if (!r._last) { if (!r._last) {
var down = A({'href': '', 'class':'movedown'}, IMG({'src': {$imagemoveblockdown}, 'alt':'{$downstr}'})); var down =
A({'href': '', 'class':'btn btn-default btn-xs movedown'},
SPAN({'class': 'fa fa-arrow-down'}),
SPAN({'class': 'sr-only'}, '{$downstr}'));
connect(down, 'onclick', function (e) { connect(down, 'onclick', function (e) {
e.stop(); e.stop();
return moveComposite(d.type, r.id, r.artefact, 'down'); return moveComposite(d.type, r.id, r.artefact, 'down');
...@@ -1108,8 +1116,14 @@ EOF; ...@@ -1108,8 +1116,14 @@ EOF;
$js .= <<<EOF $js .= <<<EOF
function (r, d) { function (r, d) {
var editlink = A({'href': 'editcomposite.php?id=' + r.id + '&artefact=' + r.artefact, 'title': {$editstr}}, IMG({'src': config.theme['images/btn_edit.png'], 'alt':{$editjsstr}})); var editlink =
var dellink = A({'href': '', 'title': {$delstr}}, IMG({'src': config.theme['images/btn_deleteremove.png'], 'alt': {$deljsstr}})); A({'href': 'editcomposite.php?id=' + r.id + '&artefact=' + r.artefact, 'title': {$editstr}, 'class': 'btn btn-default btn-xs'},
SPAN({'class': 'fa fa-pencil'}),
SPAN({'class': 'sr-only'}, {$editstr}));
var dellink =
A({'href': '', 'title': {$delstr}, 'class': 'btn btn-danger btn-xs'},
SPAN({'class': 'fa fa-trash'}),
SPAN({'class': 'sr-only'}, {$deljsstr}));
connect(dellink, 'onclick', function (e) { connect(dellink, 'onclick', function (e) {
e.stop(); e.stop();
return deleteComposite(d.type, r.id, r.artefact); return deleteComposite(d.type, r.id, r.artefact);
...@@ -1153,7 +1167,7 @@ function listAttachments(attachments) { ...@@ -1153,7 +1167,7 @@ function listAttachments(attachments) {
var link = A({'href': href}, {$downloadstr}); var link = A({'href': href}, {$downloadstr});
appendChildNodes(tbody, TR(null, TD(null, item.title + ' (' + formatSize(item.size) + ') - ', STRONG(null, link)))); appendChildNodes(tbody, TR(null, TD(null, item.title + ' (' + formatSize(item.size) + ') - ', STRONG(null, link))));
} }
return TABLE({'class': 'cb attachments fullwidth'}, thead, tbody); return TABLE({'class': 'cb attachments fullwidth table'}, thead, tbody);
} }
else { else {
// No attachments // No attachments
...@@ -1170,6 +1184,7 @@ EOF; ...@@ -1170,6 +1184,7 @@ EOF;
$elements = call_static_method(generate_artefact_class_name($compositetype), 'get_addform_elements'); $elements = call_static_method(generate_artefact_class_name($compositetype), 'get_addform_elements');
$elements['submit'] = array( $elements['submit'] = array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success',
'value' => get_string('save'), 'value' => get_string('save'),
); );
$elements['compositetype'] = array( $elements['compositetype'] = array(
......
...@@ -121,7 +121,9 @@ if (!empty($groupid)) { ...@@ -121,7 +121,9 @@ if (!empty($groupid)) {
else { else {
$smarty->assign('PAGEHEADING', SUBTITLE); $smarty->assign('PAGEHEADING', SUBTITLE);
} }
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEICON', 'fa fa-folder-open');
$smarty->assign_by_ref('form', $form); $smarty->assign_by_ref('form', $form);
$smarty->display('collection/edit.tpl'); $smarty->display('collection/edit.tpl');
......
...@@ -130,5 +130,6 @@ $smarty->assign('urlparamsstr', $urlparamsstr); ...@@ -130,5 +130,6 @@ $smarty->assign('urlparamsstr', $urlparamsstr);
$smarty->assign('collections', $data->data); $smarty->assign('collections', $data->data);
$smarty->assign('pagination', $pagination['html']); $smarty->assign('pagination', $pagination['html']);
$smarty->assign('PAGEHEADING', TITLE); $smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEICON', 'fa fa-folder-open');
$smarty->assign('PAGESUBHEADING', SUBTITLE); $smarty->assign('PAGESUBHEADING', SUBTITLE);
$smarty->display('collection/index.tpl'); $smarty->display('collection/index.tpl');
...@@ -125,6 +125,7 @@ if ($available = Collection::available_views($owner, $groupid, $institutionname) ...@@ -125,6 +125,7 @@ if ($available = Collection::available_views($owner, $groupid, $institutionname)
); );
} }
$elements['submit'] = array( $elements['submit'] = array(
'class' => 'btn btn-primary pull-right input-with-icon icon-arrow-right',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('addviews','collection'), 'value' => get_string('addviews','collection'),
'goto' => get_config('wwwroot') . 'collection/views.php?id='.$id, 'goto' =><