Skip to content

GitLab

mahara
mahara
Commit 4245c555 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells
Browse files
Options

BUG - general styling fixes 

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I754032b3288bf5ed743756019e6c1ff6d4c729bf
parent e0d6f1c6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 26815 deletions
htdocs/account/activity/index.php
View file @ 4245c555
......@@ -63,105 +63,6 @@ $strread = json_encode(get_string('read', 'activity'));
$javascript = <<<JAVASCRIPT
// function markread(form, action) {
// var e = getElementsByTagAndClassName(null,'tocheck'+action,form);
// var pd = {};
// for (cb in e) {
// if (e[cb].checked == true) {
// pd[e[cb].name] = 1;
// }
// }
// if (action == 'read') {
// pd['markasread'] = 1;
// } else if (action == 'del') {
// // If deleting, also pass the ids of unread messages, so we can update
// // the unread message count as accurately as possible.
// forEach(getElementsByTagAndClassName('input', 'tocheckread', form), function(cb) {
// pd[cb.name] = 0;
// });
// pd['delete'] = 1;
// }
// if (paginatorData) {
// for (p in paginatorData.params) {
// pd[p] = paginatorData.params[p];
// }
// }
// sendjsonrequest('index.json.php', pd, 'GET', function (data) {
// paginator.updateResults(data);
// updateUnreadCount(data);
// });
// }
// function showHideMessage(id) {
// var message = $('message-' + id);
// if (!message) {
// return;
// }
// if (hasElementClass(message, 'hidden')) {
// var unread = getFirstElementByTagAndClassName(
// 'input', 'tocheckread', message.parentNode.parentNode
// );
// var subject = getFirstElementByTagAndClassName(
// 'a', 'inbox-showmessage', message.parentNode
// );
// var unreadText = getFirstElementByTagAndClassName(
// null, 'accessible-hidden', subject
// );
// if (unread) {
// var pd = {'readone':id};
// sendjsonrequest('index.json.php', pd, 'GET', function(data) {
// swapDOM(unread, IMG({'src' : {$star}, 'alt' : {$strread}}));
// updateUnreadCount(data);
// removeElementClass(subject, 'unread');
// removeElement(unreadText);
// });
// }
// removeElementClass(message, 'hidden');
// }
// else {
// addElementClass(message, 'hidden');
// }
// }
// function changeactivitytype() {
// var delallform = document.forms['delete_all_notifications'];
// delallform.elements['type'].value = this.options[this.selectedIndex].value;
// var params = {'type': this.options[this.selectedIndex].value};
// sendjsonrequest('index.json.php', params, 'GET', function(data) {
// paginator.updateResults(data);
// });
// }
// // We want the paginator to tell us when a page gets changed.
// // @todo: remember checked/unchecked state when changing pages
// function PaginatorData() {
// var self = this;
// var params = {};
// this.pageChanged = function(data) {
// self.params = {
// 'offset': data.offset,
// 'limit': data.limit,
// 'type': data.type
// }
// }
// paginatorProxy.addObserver(self);
// connect(self, 'pagechanged', self.pageChanged);
// }
// var paginator;
// var paginatorData = new PaginatorData();
// addLoadEvent(function () {
// paginator = {$activitylist['pagination_js']}
// connect('notifications_type', 'onchange', changeactivitytype);
// });
JAVASCRIPT;
......
htdocs/artefact/multirecipientnotification/inbox.php
View file @ 4245c555
......@@ -182,7 +182,7 @@ function delete_all_notifications_submit() {
$extrastylesheets = $THEME->get_url('style.css', false, 'artefact/multirecipientnotification');
$smarty = smarty(array('paginator'),
array('<link rel="stylesheet" type="text/css" href="' . $extrastylesheets . '">')
array('')
);
$smarty->assign('options', $options);
$smarty->assign('type', $type);
......
htdocs/artefact/multirecipientnotification/js/sendmessage.js
View file @ 4245c555
......@@ -36,9 +36,7 @@ function initializeAutocomplete() {
var jLink = jQuery(link);
jLink.attr('onclick', 'removeRecipient("' + username + '")');
var img = document.createElement('img');
var jImg = jQuery(img);
jImg.attr('src', get_themeurl('images/btn_deleteremove.png'));
jLink.append(jImg);
jUserspan.append(jLink);
jQuery('#sendmessage_addnewrecipient').before(jUserspan);
......
htdocs/artefact/multirecipientnotification/lib/activityextend.php
View file @ 4245c555
......@@ -270,6 +270,11 @@ function activitylistin_html($type='all', $limit=10, $offset=0) {
}
}
// echo '<pre class="mtxl ptxl">';
// print_r($records);
//
// die;
$smarty = smarty_core();
$smarty->assign('data', $records);
$smarty->assign('USER', $USER);
......
htdocs/skin/css/design.css
View file @ 4245c555
......@@ -116,27 +116,6 @@
padding-bottom: 2px;
}
.feedback {
background: url("design/feedback.png") no-repeat scroll left top transparent;
padding-left: 20px !important;
}
.annotation {
background: url("design/annotation.png") no-repeat scroll left top transparent;
padding-left: 20px !important;
}
.objection {
background: url("design/objectionable.png") no-repeat scroll left top transparent;
padding-left: 20px !important;
}
.print {
background: url("design/print.png") no-repeat scroll left top transparent;
padding-left: 20px !important;
}
.watchlist {
background: url("design/watchlist.png") no-repeat scroll left top transparent;
padding-left: 20px !important;
}
.help, .help a, .help a img {
vertical-align: top;
}
\ No newline at end of file
}
htdocs/theme/bootstrap/artefact/file/templates/profileicons.tpl
View file @ 4245c555
{include file="header.tpl"}
{$settingsformtag|safe}
<div class="table-responsive">
<table id="profileicons" class="hidden tablerenderer fullwidth table">
<table id="profileicons" class="hidden fullwidth table table-striped">
<thead>
<tr>
<th class="profileiconcell">{str tag="image"}</th>
......@@ -20,7 +20,7 @@
{str tag="setdefault" section=artefact.file}
</button>
<button id="settings_delete" type="submit" class="delete btn btn-default" name="delete">
<span class="fa fa-trash fa-lg text-danger prs"></span>
<span class="fa fa-trash fa-lg text-danger prs"></span>
{str tag="deleteselectedicons" section=artefact.file}
</button>
</td>
......
htdocs/theme/bootstrap/artefact/multirecipientnotification/templates/activitylistin.tpl
View file @ 4245c555
......@@ -13,16 +13,25 @@
<a class="collapsed" href="#notification-{$item->table}-{$item->id}" data-id="{$item->id}" data-table="{$item->table}" data-toggle="collapse" aria-expanded="1" aria-controls="notification-{$item->table}-{$item->id}">
<span class="details-group">
{if $item->read && $item->type == 'usermessage'}
<span class="fa fa-envelope type-icon prxl plxl"></span><span class="sr-only">{$item->strtype} - {str tag='read' section='activity'}</span>
{elseif $item->strtype == 'usermessage'}
<span class="fa fa-envelope type-icon prxl plxl"></span><span class="sr-only">{$item->strtype}</span>
{elseif $item->strtype == 'Institution message'}
<span class="fa fa-university type-icon prxl plxl"></span>
<span class="sr-only">{$item->strtype}</span>
<span class="fa fa-envelope type-icon prxl plxl"></span>
<span class="sr-only">{$item->strtype} - {str tag='read' section='activity'}</span>
{else}
<span class="fa fa-wrench type-icon prxl plxl"></span>
<span class="sr-only">{$item->strtype}</span>
{if $item->type == 'usermessage'}
<span class="fa fa-envelope type-icon prxl plxl"></span>
{elseif $item->type == 'institutionmessage'}
<span class="fa fa-university type-icon prxl plxl"></span>
{elseif $item->type == 'feedback'}
<span class="fa fa-comments type-icon prxl plxl"></span>
{elseif $item->type == 'annotationfeedback'}
<span class="fa fa-comments-o type-icon prxl plxl"></span>
{else}
<span class="fa fa-wrench type-icon prxl plxl"></span>
{/if}
<span class="sr-only">{$item->strtype}</span>
{/if}
<span class="sr-only">{str section='activity' tag='subject'}</span>
{if !$item->read}
<span class="accessible-hidden sr-only">
......
htdocs/theme/bootstrap/file/blocktype/filedownload/templates/filedownload.tpl deleted 100644 → 0
View file @ e0d6f1c6
{foreach $files file}
<div class="filedownload-item" title="{$file.title}">
<div class="fl"><a href="{$file.downloadurl}" target="_blank"><img src="{$file.iconsrc}" alt=""></a></div>
<div style="margin-left: 30px;">
<h3 class="title"><a href="{$file.downloadurl}" target="_blank">{$file.title}</a></h3>
{if $file.description}<div class="detail">{$file.description}</div>{/if}
<div class="description">{$file.size|display_size} | {$file.ctime|format_date:'strftimedaydate'}
| <a href="{$WWWROOT}artefact/artefact.php?artefact={$file.id}&view={$viewid}">{str tag=Details section=artefact.file}</a></div>
</div>
</div>
{/foreach}
htdocs/theme/bootstrap/file/blocktype/folder/templates/folder.tpl deleted 100644 → 0
View file @ e0d6f1c6
{$html|safe}
{if $commentcount || $commentcount === '0'}
{$comments|safe}
{/if}
htdocs/theme/bootstrap/file/blocktype/gallery/templates/flickrshow.tpl deleted 100644 → 0
View file @ e0d6f1c6
{if $images}
<object width="{$width}" height="{$height}">
<param name="flashvars" value="offsite=true&page_show_url=%2Fphotos%2F{$images.user}%2Fsets%2F{$images.gallery}%2Fshow%2F&set_id={$images.gallery}"></param>
<param name="movie" value="https://www.flickr.com/apps/slideshow/show.swf?v=71649"></param>
<param name="allowFullScreen" value="true"></param>
<embed type="application/x-shockwave-flash" src="https://www.flickr.com/apps/slideshow/show.swf?v=71649" allowFullScreen="true" flashvars="offsite=true&page_show_url=%2Fphotos%2F{$images.user}%2Fsets%2F{$images.gallery}%2Fshow%2F&set_id={$images.gallery}" width="{$width}" height="{$height}"></embed>
</object>
{else}
{str tag=cannotdisplayslideshow section=blocktype.file/gallery}
{/if}
htdocs/theme/bootstrap/file/blocktype/gallery/templates/imagecloud.tpl deleted 100644 → 0
View file @ e0d6f1c6
{if $images}
<div style="width:{$width}px; text-align:center;">
<object type="application/x-shockwave-flash" data="http://media.roytanck.com/flickrwidget.swf" width="{$width}" height="{$width}">
<param name="movie" value="http://media.roytanck.com/flickrwidget.swf" />
<param name="bgcolor" value="#ffffff" />
<param name="flashvars" value="feed={$images}" />