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

BUG - general styling fixes

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I754032b3288bf5ed743756019e6c1ff6d4c729bf
parent e0d6f1c6
......@@ -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;
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
}
{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>
......
......@@ -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-envelope type-icon prxl plxl"></span>
<span class="sr-only">{$item->strtype} - {str tag='read' section='activity'}</span>
{else}
{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>
<span class="sr-only">{$item->strtype}</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">
......
{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}
{$html|safe}
{if $commentcount || $commentcount === '0'}
{$comments|safe}
{/if}
{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}
{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}" />
<param name="AllowScriptAccess" value="always"/>
<p>
<a href="http://www.roytanck.com">Roy Tanck</a>'s Flickr Widget requires Flash Player 9 or better.</p>
</object>
<span class="s"><a href="http://www.roytanck.com">roytanck.com</a></span>
</div>
{else}
{str tag=noimagesfound section=artefact.file}
{/if}
{if $images}
<iframe marginheight="0" marginwidth="0" width="{$width}" height="{$height}" scrolling="no" frameborder="0" src="http://www.panoramio.com/user/{$images.user}/slideshow"></iframe>
{else}
{str tag=cannotdisplayslideshow section=blocktype.file/gallery}
{/if}
{if $images}
<iframe marginheight="0" marginwidth="0" width="{$width}" height="{$height}" scrolling="no" frameborder="0" src="{$images.url}/{$images.user}/{$images.album}?albumview=slideshow"></iframe>
{else}
{str tag=cannotdisplayslideshow section=blocktype.file/gallery}
{/if}
{if $images}
<object width="{$width}" height="{$height}">
<param name="flashvars" value="host=picasaweb.google.com&feat=flashalbum&RGB=0x000000&feed=http%3A%2F%2Fpicasaweb.google.com%2Fdata%2Ffeed%2Fapi%2Fuser%2F{$images.user}%2Falbum%2F{$images.gallery}%3Falt%3Drss%26kind%3Dphoto"></param>
<param name="movie" value="https://picasaweb.google.com/s/c/bin/slideshow.swf"></param>
<param name="allowFullScreen" value="true"></param>
<embed type="application/x-shockwave-flash" src="https://picasaweb.google.com/s/c/bin/slideshow.swf" width="{$width}" height="{$height}" allowFullScreen="true" flashvars="host=picasaweb.google.com&feat=flashalbum&RGB=0x000000&feed=http%3A%2F%2Fpicasaweb.google.com%2Fdata%2Ffeed%2Fapi%2Fuser%2F{$images.user}%2Falbum%2F{$images.gallery}%3Falt%3Drss%26kind%3Dphoto"></embed>
</object>
{else}
{str tag=cannotdisplayslideshow section=blocktype.file/gallery}
{/if}
{if $images}
<div class="slideshow" id="slideshow{$instanceid}">
<table class="images fullwidth">
<tr>
<td class="control">
<span class="prev disabled">&lsaquo;</span>
<span class="first disabled">&laquo;</span>
</td>
<td>
{foreach from=$images item=image key=k name=images}
<a href="{$image.link}" target="_blank"><img src="{$image.source}" alt="{$image.title}" title="{$image.title}" style="max-width: {$width}px;{if !$dwoo.foreach.images.first} display:none;{/if}"></a>
{if $showdescription && $image.title}<div class="caption" id="description_{$instanceid}_{$k}" style="{if !$dwoo.foreach.images.first} display:none;{/if}">{$image.title}</div>{/if}
{/foreach}
</td>
<td class="control">
<span class="next disabled">&rsaquo;</span>
<span class="last disabled">&raquo;</span>
</td>
</tr>
</table>
</div>
<script type="application/javascript">
var slideshow{$instanceid} = new Slideshow({$instanceid}, {$count});
$j(function() {
if (($j('#slideshow{$instanceid}').width() - 60) < {$width}) {
// adjust max-width of images to fit within slider
$j('#slideshow{$instanceid} img').each(function() {
$j(this).css('max-width',$j('#slideshow{$instanceid}').width() - 60);
});
}
});
</script>
{else}
{str tag=noimagesfound section=artefact.file}
{/if}
{if $commentcount || $commentcount === '0'}
{$comments|safe}
{/if}
<div class="thumbnails" id="thumbnails{$instanceid}">
{foreach from=$images item=image}
<div style="float:left;{if $frame} padding: 3px;{/if}{if $image.squaredimensions}width:{$image.squaredimensions}px;height:{$image.squaredimensions}px;{/if}" class="thumb">
<div class="thumbimage" style="{if $image.squaredimensions}height:{$image.squaredimensions}px;{/if}">
<a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}" style="position:relative;top:{$image.squaretop}px" target="_blank">
<img src="{$image.source}" alt="{$image.title}" title="{$image.title}" width="{if $image.width}{$image.width}{else}{$width}{/if}" height="{if $image.height}{$image.height}{else}{$width}{/if}" {if $frame}class="frame"{/if}/>
</a>
</div>
{if $showdescription && $image.title}<div class="caption" style="top: 4px;width: {$width}px;">{$image.title|safe}</div>{/if}
</div>
{/foreach}
<div class="cb"></div>
</div>
<script type="application/javascript">
$j(function() {
if ($j('#thumbnails{$instanceid}')) {
// adjust height of image + description box to align things up
var maxHeight = Math.max.apply(null, $j('#thumbnails{$instanceid} .thumb').map(function() {
var height = parseInt($j(this).css('height'), 10);
if ($j(this).find('.caption').length > 0) {
height += parseInt($j(this).find('.caption').height(), 10);
}
return (height + 3); // we will give it a little more heigth to avoid a vertical scrollbar sometimes appearing
}).get());
$j('#thumbnails{$instanceid} .thumb').each(function() {
$j(this).css('height', maxHeight);
});
}
});
</script>
{if isset($copyright)}<div class="cb" id="lbBottom">{$copyright|safe}</div>{/if}
{if $commentcount || $commentcount === '0'}
{$comments|safe}
{/if}
<a href="https://www.flickr.com/" target="_blank">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/flickr.png" border="0" width="16" height="16" title="{str tag=flickrsets section=blocktype.file/gallery}">
</a>
<a href="http://picasaweb.google.com/" target="_blank">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/picasa.png" border="0" width="16" height="16" title="{str tag=picasaalbums section=blocktype.file/gallery}">
</a>
<a href="http://www.panoramio.com/" target="_blank">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/panoramio.png" border="0" width="16" height="16" title="{str tag=panoramiouserphotos section=blocktype.file/gallery}">
</a>
<a href="http://www.photobucket.com/" target="_blank">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/photobucket.png" border="0" width="16" height="16" title="{str tag=photobucketphotosandalbums section=blocktype.file/gallery}">
</a>
<a href="http://www.live.com/" target="_blank">
<img src="{$wwwroot}artefact/file/blocktype/gallery/logos/windowslive.png" border="0" width="16" height="16" title="{str tag=windowslivephotoalbums section=blocktype.file/gallery}">
</a>
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