Skip to content

GitLab

Commit e618ed73 authored by Pat Kira's avatar Pat Kira Committed by Robert Lyon
1 Browse files
Options

Remove whitespace classes (bug: 1465107) 

behatnotneeded: styling only

Change-Id: Ie47b903e93816c7bac53437bdbb3842020a0effe
parent 51a0dd57
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2532 additions and 2345 deletions
htdocs/admin/groups/groupcategories.php
View file @ e618ed73
......@@ -135,7 +135,7 @@ function editform(item) {
// Either a save, a cancel button, or both.
var savecancel = [];
var save = INPUT({'type':'button','class':'button btn btn-default mtl'});
var save = INPUT({'type':'button','class':'button btn btn-default btn-add-group'});
connect(save, 'onclick', function () { saveitem(item.id); });
var rowtype = 'add';
......
htdocs/admin/site/cookieconsent.php
View file @ e618ed73
......@@ -167,7 +167,7 @@ $form = pieform(array(
),
),
'submit' => array(
'class' => 'mtl btn-primary',
'class' => 'btn-primary',
'type' => 'submit',
'value' => get_string('savechanges', 'admin')
),
......
htdocs/admin/site/menu.php
View file @ e618ed73
......@@ -72,9 +72,9 @@ function formatrow (item) {
// item has id, type, name, link, linkedto
var type = eval(item.type);
var linkedto = A({'href':item.linkedto},item.linktext);
var edit = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-lg icon-pencil prs'}), {$getstring['edit']});
var edit = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-lg icon-pencil left'}), {$getstring['edit']});
connect(edit, 'onclick', function () { edititem(item); });
var del = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-lg icon-times text-danger prs'}), {$getstring['delete']});
var del = BUTTON({'type':'button','class':'button btn btn-default btn-sm'}, SPAN({'class':'icon icon-lg icon-times text-danger left'}), {$getstring['delete']});
connect(del, 'onclick', function () { delitem(item.id); });
var buttonGroup = SPAN({'class':'btn-group'}, edit, del);
var cells = map(
......@@ -271,7 +271,7 @@ $footerelements = array();
foreach ($all as $k => $v) {
$footerelements[$k] = array(
'type' => 'switchbox',
'class' => 'last pb0',
'class' => 'last with-text-input',
'title' => $v['title'],
'defaultvalue' => in_array($k, $active),
'onclick' => "getElement('footerlinks_{$k}_link').disabled = !this.checked;",
......
htdocs/admin/site/networking.php
View file @ e618ed73
......@@ -90,10 +90,10 @@ $networkingform = pieform(
),
'submitbuttons' => array(
'type' => 'fieldset',
'class' => 'btn-group',
'class' => 'btn-group last',
'elements' => array (
'submit' => array(
'class' => 'btn-primary',
'class' => 'btn-primary text-inline',
'name' => 'submit',
'type' => 'button',
'usebuttontag' => true,
......@@ -101,11 +101,11 @@ $networkingform = pieform(
'value' => 'submit'
),
'deletesubmit' => array(
'class' => 'btn-default ptm',
'class' => 'btn-default text-inline',
'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button',
'usebuttontag' => true,
'content' => '<span class="icon icon-refresh icon-lg prs text-danger"></span> '. get_string('deletekey', 'admin'),
'content' => '<span class="icon icon-refresh icon-lg left text-danger"></span> '. get_string('deletekey', 'admin'),
'value' => 'deletekey'
)
)
......
htdocs/admin/site/options.php
View file @ e618ed73
......@@ -727,7 +727,7 @@ $siteoptionform = array(
),
'loggingsettings' => array(
'iconclass'=>'exclamation-triangle',
'class' => 'last mbxl',
'class' => 'last',
'type' => 'fieldset',
'collapsible' => true,
'collapsed' => true,
......
htdocs/admin/upgrade.php
View file @ e618ed73
......@@ -57,7 +57,7 @@ if (empty($upgrades['settings']['disablelogin'])) {
unset($upgrades['settings']);
if (!$upgrades) {
die_info('<p class="text-center lead mtxl ptxl">' . get_string('noupgrades', 'admin') . '</p>');
die_info('<p>' . get_string('noupgrades', 'admin') . '</p>');
}
$start = time();
......@@ -88,10 +88,10 @@ if (empty($upgrades['core']->install)) {
}
}
$loadingicon = 'icon icon-spinner icon-pulse prs';
$successicon = 'icon icon-check text-success prs';
$failureicon = 'icon icon-exclaimation-triangle prs';
$warningicon = 'icon icon-exclaimation-triangle prs';
$loadingicon = 'icon icon-spinner icon-pulse left';
$successicon = 'icon icon-check text-success left';
$failureicon = 'icon icon-exclaimation-triangle left';
$warningicon = 'icon icon-exclaimation-triangle left';
// Remove all files in the smarty and dwoo caches
......
htdocs/admin/users/add.php
View file @ e618ed73
......@@ -119,7 +119,7 @@ $elements = array(
'submit' => array(
'type' => 'submit',
'value' => get_string('createuser', 'admin'),
'class' => 'btn-primary btn-lg btn-block mtm',
'class' => 'btn-primary btn-lg btn-block',
),
);
......@@ -145,7 +145,7 @@ unset($prefs);
$form = pieform(array(
'name' => 'adduser',
'class' => 'panel panel-default panel-body pts',
'class' => 'panel panel-default panel-body',
'autofocus' => false,
'template' => 'adduser.php',
'templatedir' => pieform_template_dir('adduser.php'),
......
htdocs/admin/users/bulk.php
View file @ e618ed73
......@@ -177,7 +177,7 @@ $deleteform = pieform(array(
'usebuttontag' => true,
'class' => 'btn-default',
'confirm' => get_string('confirmdeleteusers', 'admin'),
'value' => '<span class="icon icon-lg icon-user-times prs text-danger"></span>' . get_string('deleteusers', 'admin'),
'value' => '<span class="icon icon-lg icon-user-times left text-danger"></span>' . get_string('deleteusers', 'admin'),
),
),
));
......
htdocs/admin/users/edit.php
View file @ e618ed73
......@@ -121,7 +121,7 @@ if ($USER->get('admin') || get_config_plugin('artefact', 'file', 'institutionalo
'description' => get_string('filequotadescription','admin') . '<br>' . $quotaused,
'rules' => array('integer' => true,
'minvalue' => 1),
'class' => 'form-inline mls',
'class' => 'form-inline',
'defaultvalue' => $user->quota,
);
}
......@@ -131,7 +131,7 @@ else {
'disabled' => true,
'title' => get_string('filequota1', 'admin'),
'description' => get_string('filequotadescription', 'admin') . '<br>' . $quotaused,
'class' => 'form-inline mls',
'class' => 'form-inline',
'value' => display_size($user->quota),
);
}
......@@ -251,7 +251,7 @@ $elements['tags'] = array(
$elements['submit'] = array(
'type' => 'submit',
'class' => 'btn-primary mbm',
'class' => 'btn-primary',
'value' => get_string('savechanges','admin'),
);
......@@ -260,6 +260,7 @@ $siteform = pieform(array(
'renderer' => 'div',
'plugintype' => 'core',
'pluginname' => 'admin',
'class' => 'form-group-nested',
'elements' => $elements,
));
......@@ -777,7 +778,7 @@ foreach ($institutions as $i) {
)
);
if ($institutionloop == $institutionlength - 1) {
$elements[$i->institution.'_settings']['class'] = 'last mbl';
$elements[$i->institution.'_settings']['class'] = 'last';
}
$institutionloop++;
}
......@@ -803,7 +804,7 @@ if ($USER->get('admin')
);
$elements['add'] = array(
'type' => 'submit',
'class' => 'btn-primary mbs',
'class' => 'btn-primary',
'value' => get_string('addusertoinstitution', 'admin'),
);
}
......
htdocs/admin/users/institutions.php
View file @ e618ed73
......@@ -1073,7 +1073,7 @@ if ($institution && $institution != 'mahara') {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-lg text-danger icon-ban prm"></span>' . get_string('suspendinstitution','admin'),
'value' => '<span class="icon icon-lg text-danger icon-ban left"></span>' . get_string('suspendinstitution','admin'),
),
)
);
......@@ -1095,7 +1095,7 @@ if ($institution && $institution != 'mahara') {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-lg text-success icon-check prm"></span>' . get_string('unsuspendinstitution','admin'),
'value' => '<span class="icon icon-lg text-success icon-check left"></span>' . get_string('unsuspendinstitution','admin'),
'description' => get_string('unsuspendinstitutiondescription','admin'),
),
)
......
htdocs/admin/users/search.php
View file @ e618ed73
......@@ -58,7 +58,7 @@ $calendar = array(
'name' => 'loggedindate',
'id' => 'loggedindate',
'tabindex' => false,
'class' => 'form-control mtm',
'class' => 'form-control',
'type' => 'calendar',
'title' => get_string('date'),
'imagefile' => $THEME->get_image_url('calendar'),
......
htdocs/admin/users/uploadcsv.php
View file @ e618ed73
......@@ -90,7 +90,6 @@ $form = array(
'file' => array(
'type' => 'file',
'title' => get_string('csvfile', 'admin'),
'class' => 'pl0',
'description' => get_string('csvfiledescription', 'admin'),
'accept' => '.csv, text/csv, application/csv, text/comma-separated-values',
'rules' => array(
......@@ -120,7 +119,7 @@ $form = array(
'legend' => get_string('accountoptionsdesc', 'account'),
'collapsible' => true,
'collapsed' => true,
'class' => 'last',
'class' => 'last with-formgroup',
'elements' => general_account_prefs_form_elements($prefs),
),
'progress_meter_token' => array(
......
htdocs/artefact/annotation/lib.php
View file @ e618ed73
......@@ -1097,7 +1097,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
}
$form['elements']['message'] = array(
'type' => 'wysiwyg',
'class' => 'pt0 hide-label',
'class' => 'hide-label',
'title' => get_string('Annotationfeedback', 'artefact.annotation'),
'rows' => 5,
'cols' => 80,
......@@ -1168,7 +1168,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'usebuttontag' => true,
'class' => 'btn-link btn-xs quiet',
'name' => 'make_annotation_feedback_public_submit',
'value' => '<span class="icon icon-lock text-default prs"></span>' . get_string('makepublic', 'artefact.annotation'),
'value' => '<span class="icon icon-lock text-default left"></span>' . get_string('makepublic', 'artefact.annotation'),
),
),
);
......
htdocs/artefact/comment/lib.php
View file @ e618ed73
......@@ -999,7 +999,7 @@ class ArtefactTypeComment extends ArtefactType {
'usebuttontag' => true,
'class' => 'btn-link btn-xs',
'name' => 'make_public_submit',
'value' => '<span class="icon icon-lock text-default prs"></span>' . get_string('makepublic', 'artefact.comment'),
'value' => '<span class="icon icon-lock text-default left"></span>' . get_string('makepublic', 'artefact.comment'),
),
),
);
......
htdocs/artefact/file/blocktype/filedownload/lib.php
View file @ e618ed73
......@@ -88,7 +88,7 @@ class PluginBlocktypeFiledownload extends PluginBlocktype {
'collapsible' => true,
'collapsed' => true,
'legend' => get_string('Files', 'blocktype.file/filedownload'),
'class' => 'last mtl',
'class' => 'last with-formgroup',
'elements' => array(
'artefactid' => self::filebrowser_element($instance, (isset($configdata['artefactids'])) ? $configdata['artefactids'] : null)
)
......
htdocs/artefact/file/blocktype/folder/lib.php
View file @ e618ed73
......@@ -131,7 +131,7 @@ class PluginBlocktypeFolder extends PluginBlocktype {
'collapsible' => true,
'collapsed' => true,
'legend' => get_string('Folders', 'artefact.file'),
'class' => 'last select-file mtl',
'class' => 'last select-file with-formgroup',
'elements' => array(
'artefactid' => self::filebrowser_element($instance, (isset($configdata['artefactid'])) ? array($configdata['artefactid']) : null),
)
......
htdocs/artefact/file/blocktype/html/lib.php
View file @ e618ed73
......@@ -69,7 +69,7 @@ class PluginBlocktypeHtml extends PluginBlocktype {
'collapsible' => true,
'collapsed' => true,
'legend' => get_string('file', 'artefact.file'),
'class' => 'last select-file mtl',
'class' => 'last select-file with-formgroup',
'elements' => array(
'artefactid' => self::filebrowser_element($instance, (isset($configdata['artefactid'])) ? array($configdata['artefactid']) : null),
)
......
htdocs/artefact/file/blocktype/image/lib.php
View file @ e618ed73
......@@ -87,7 +87,7 @@ class PluginBlocktypeImage extends PluginBlocktype {
'collapsible' => true,
'collapsed' => true,
'legend' => get_string('image'),
'class' => 'last select-file mtl',
'class' => 'last select-file with-formgroup',
'elements' => array(
'artefactid' => $filebrowser
)
......
htdocs/artefact/file/blocktype/internalmedia/lib.php
View file @ e618ed73
......@@ -57,7 +57,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
return get_string('typeremoved', 'blocktype.file/internalmedia');
}
$callbacks = self::get_all_filetype_players();
$result .= '<div class="mediaplayer-container panel-body"><div class="mediaplayer">' . call_static_method('PluginBlocktypeInternalmedia', $callbacks[$mimetypefiletypes[$mimetype]], $artefact, $instance, $width, $height) . '</div></div>';
$result .= '<div class="mediaplayer-container panel-body flush"><div class="mediaplayer">' . call_static_method('PluginBlocktypeInternalmedia', $callbacks[$mimetypefiletypes[$mimetype]], $artefact, $instance, $width, $height) . '</div></div>';
if ($artefactid) {
require_once(get_config('docroot') . 'artefact/comment/lib.php');
......@@ -96,7 +96,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
'collapsible' => true,
'collapsed' => true,
'legend' => get_string('media', 'blocktype.file/internalmedia'),
'class' => 'last select-file mtl',
'class' => 'last select-file with-formgroup',
'elements' => array(
'artefactid' => $filebrowser
)
......@@ -336,7 +336,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
$html = '<span class="blocktype_internalmedia_mp3" id="' . $id . '" style="display:block;width:'.$width.'px;height:'.$height.'px;"></span>';
$html .= '<span id="' . $id . '_h">' . get_string('flashanimation', 'blocktype.file/internalmedia') . '</span>';
$html .= '<div class="ptm"><span class="icon icon-download prs"></span><span class="sr-only">'.get_string('Download', 'artefact.internal').'</span><a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a>';
$html .= '<div class="media-download content-text"><span class="icon icon-download left"></span><span class="sr-only">'.get_string('Download', 'artefact.internal').'</span><a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a>';
$html .= '<span class="text-lighttone text-small"> ['.$filesize.'] </span></div>';
$html .= '<script type="application/javascript">
flowplayer("'.$id.'", "'.$playerurl.'", {
......
htdocs/artefact/file/blocktype/internalmedia/mahara-flashplayer/mahara-flashplayer.js
View file @ e618ed73
......@@ -1544,7 +1544,7 @@ if (typeof jQuery == 'function') {
root.style.width = "auto";
root.style.height = "auto";
root.innerHTML =
"<p class='alert alert-danger mbm'>Flash version " + opts.version + " or greater is required. " +
"<p class='alert alert-danger'>Flash version " + opts.version + " or greater is required. " +
"<span>" +
(VERSION[0] > 0 ? "Your version is " + VERSION : "You have no flash plugin installed. ") +
"</span>" +
......
htdocs/artefact/file/blocktype/pdf/lib.php
View file @ e618ed73
......@@ -102,7 +102,7 @@ class PluginBlocktypePdf extends PluginBlocktype {
'collapsible' => true,
'collapsed' => true,
'legend' => get_string('file', 'artefact.file'),
'class' => 'last select-file mtl',
'class' => 'last select-file with-formgroup',
'elements' => array(
'artefactid' => $filebrowser
)
......
htdocs/artefact/file/js/filebrowser.js
View file @ e618ed73
......@@ -489,7 +489,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
e.preventDefault();
}
});
ul.append($j('<li><span class="icon icon-long-arrow-right prm"></span>').append(link));
ul.append($j('<li><span class="icon icon-long-arrow-right left"></span>').append(link));
}
});
......@@ -506,7 +506,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
e.preventDefault();
}
});
ul.append($j('<li><span class="icon icon-times prm"></span>').append(cancellink));
ul.append($j('<li><span class="icon icon-times left"></span>').append(cancellink));
wrapper.append(ul);
self.move_list = wrapper;
......@@ -759,7 +759,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
}
};
if (!existed) {
var remove = BUTTON({'class': 'btn-link text-small button submit unselect', 'type': 'submit', 'name': self.id+'_unselect[' + id + ']', 'title': get_string('remove')}, SPAN({'class': 'icon icon-times icon-lg text-danger prs'}), SPAN(null, get_string('remove')));
var remove = BUTTON({'class': 'btn-link text-small button submit unselect', 'type': 'submit', 'name': self.id+'_unselect[' + id + ']', 'title': get_string('remove')}, SPAN({'class': 'icon icon-times icon-lg text-danger left'}), SPAN(null, get_string('remove')));
connect(remove, 'onclick', self.unselect);
filelink = ''
......
htdocs/artefact/internal/blocktype/socialprofile/lib.php
View file @ e618ed73
......@@ -85,7 +85,7 @@ class PluginBlocktypeSocialprofile extends PluginBlocktype {
'type' => 'fieldset',
'collapsible' => true,
'collapsed' => true,
'class' => 'first last ptl',
'class' => 'first last',
'legend' => get_string('displaysettings', 'blocktype.internal/socialprofile'),
'elements' => array(
'displaytype' => array(
......
htdocs/artefact/internal/blocktype/textbox/lib.php
View file @ e618ed73
......@@ -362,7 +362,7 @@ EOF;
'type' => 'html',
'class' => 'hidden text-right',
'value' => '<a href="' . $manageurl . '" target="_blank" class="pull-right">'
. get_string('managealltextboxcontent1', 'blocktype.internal/textbox') . ' <span class="icon icon-arrow-right pls"></span></a>',
. get_string('managealltextboxcontent1', 'blocktype.internal/textbox') . ' <span class="icon icon-arrow-right right"></span></a>',
),
'artefactid' => self::artefactchooser_element(isset($artefactid) ? $artefactid : null),
'license' => license_form_el_basic(isset($artefact) ? $artefact : null),
......@@ -396,7 +396,7 @@ EOF;
'collapsible' => true,
'collapsed' => true,
'legend' => get_string('attachments', 'artefact.blog'),
'class' => 'last mtl',
'class' => 'last with-formgroup',
'elements' => array(
'artefactids' => self::filebrowser_element($instance, (isset($configdata['artefactids'])) ? $configdata['artefactids'] : null),
)
......
htdocs/artefact/resume/lib.php
View file @ e618ed73
......@@ -1032,7 +1032,7 @@ EOF;
e.stop();
return showhideComposite(r, {$bodystring}, {$attachstring});
});
var extra = DIV({'class': 'detail mbs text-lighttone'}, {$extrastring});
var extra = DIV({'class': 'detail text-lighttone'}, {$extrastring});
return TD({'id': 'composite-' + r.artefact + '-' + r.id}, DIV({'class': 'expandable-head'}, link, extra));
},
";
......@@ -1055,11 +1055,11 @@ EOF;
}
if (attachments) {
var newNode = DIV({'id': 'composite-body-' + r.artefact + '-' + r.id},
DIV({'class':'compositedesc'}, content), attachments);
DIV({'class':'content-text'}, content), attachments);
}
else {
var newNode = DIV({'id': 'composite-body-' + r.artefact + '-' + r.id},
DIV({'class':'compositedesc'}, content));
DIV({'class':'content-text'}, content));
}
insertSiblingNodesAfter(getFirstElementByTagAndClassName(null, 'expandable-head', titleTD), newNode);
setupExpanders(jQuery(newNode));
......
htdocs/auth/lib.php
View file @ e618ed73
......@@ -1303,13 +1303,12 @@ function auth_get_login_form_elements() {
if (!empty($extraelements) && $showbasicform) {
$loginlabel = array(
'type' => 'markup',
'value' => get_string('orloginvia')
'value' => '<p>' . get_string('orloginvia') . '</p>'
);
$extraelements = array_merge(array('label' => $loginlabel), $extraelements);
$keys = array_keys($extraelements);
if (!empty($keys)) {
$key = $keys[count($keys) - 1];
$extraelements[$key]['value'] .= '<div class="cb"></div>';
}
}
if (count($extraelements)) {
......
htdocs/blocktype/myfriends/lib.php
View file @ e618ed73
......@@ -115,7 +115,7 @@ class PluginBlocktypeMyfriends extends SystemBlocktype {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-user-plus icon-lg prs"></span>' .get_string('addtomyfriends', 'group')
'value' => '<span class="icon icon-user-plus icon-lg left"></span>' .get_string('addtomyfriends', 'group')
),
'id' => array(
'type' => 'hidden',
......
htdocs/collection/views.php
View file @ e618ed73
......@@ -141,7 +141,7 @@ if ($available = Collection::available_views($owner, $groupid, $institutionname)
'class' => 'btn-primary pull-right add-pages',
'type' => 'button',
'usebuttontag' => true,
'value' => '<span class="icon icon-arrow-right prs"></span>' . get_string('addviews','collection'),
'value' => '<span class="icon icon-arrow-right left"></span>' . get_string('addviews','collection'),
'goto' => get_config('wwwroot') . 'collection/views.php?id='.$id,
);
......
htdocs/group/edit.php
View file @ e618ed73
......@@ -122,7 +122,7 @@ $elements = array();
$elements['membership'] = array(
'type' => 'html',
'value' => '<h4 class="mb0">' . get_string('Membership', 'group') . '</h4>',
'value' => '<h4>' . get_string('Membership', 'group') . '</h4>',
);
$cancreatecontrolled = $USER->get('admin') || $USER->get('staff')
......@@ -209,7 +209,7 @@ $elements['suggestfriends'] = array(
$elements['pages'] = array(
'type' => 'html',
'value' => '<h4 class="mb0">' . get_string('content') . '</h4>',
'value' => '<h4>' . get_string('content') . '</h4>',