Skip to content

Consolidate browse links. #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kimisgold wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −52
Open

Consolidate browse links. #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions admin/themes/default/collections/browse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,15 @@
<?php foreach (loop('Collection') as $collection): ?>
<tr class="collection<?php if(++$key%2==1) echo ' odd'; else echo ' even'; ?>">
<td class="title<?php if ($collection->featured) { echo ' featured';} ?>">
<?php if ($collectionImage = record_image('collection', 'square_thumbnail')): ?>
<?php echo link_to_collection($collectionImage, array('class' => 'image')); ?>
<?php endif; ?>


<span class="title">
<?php echo link_to_collection(); ?>
<?php
$linkContent = '';
if ($collectionImage = record_image('collection', 'square_thumbnail', array('class' => 'image'))) {
$linkContent .= $collectionImage;
}
$linkContent .= metadata('collection', 'rich_title');
echo link_to_collection($linkContent);
?>
<?php if ($collection->featured): ?>
<div class="featured-icon">
<span class="featured" aria-hidden="true" title="<?php echo __('Featured'); ?>"></span>
Expand Down
11 changes: 1 addition & 10 deletions admin/themes/default/css/sass/base/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,18 +193,9 @@ dd {

.exhibit .image,
.collection .image {
-webkit-box-shadow: -6px -6px rgba(0, 0, 0, 0.1);
-moz-box-shadow: -6px -6px rgba(0, 0, 0, 0.1);
box-shadow: -6px -6px rgba(0, 0, 0, 0.1);
box-shadow: -6px -6px rgba(0, 0, 0, 0.1), -3px -3px rgba(0, 0, 0, 0.2);
margin: 6px 10px 0 6px;
}

.collection .image img,
.exhibit .image img {
width: 48px;
-webkit-box-shadow: -3px -3px rgba(0, 0, 0, 0.2);
-moz-box-shadow: -3px -3px rgba(0, 0, 0, 0.2);
box-shadow: -3px -3px rgba(0, 0, 0, 0.2);
}


Expand Down
9 changes: 4 additions & 5 deletions admin/themes/default/css/sass/pages/_items.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,21 @@
margin: 0 0 20px 0;
}

.items.browse a.item-thumbnail {
.items.browse .item-thumbnail {
float: left;
margin: 0 10px 0 0;
width: 20%;
}

@media screen and (max-width: 480px) {
.items.browse a.item-thumbnail {
.items.browse .item-thumbnail {
width: auto;
}
}
.items.browse .item-thumbnail img {
.items.browse .item-thumbnail {
display: block;
border: 1px solid $lightgrayborder;
width: 100%;
margin: 0;
margin: 0 $spacing-m 0 0;
float: left;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
Expand Down
23 changes: 7 additions & 16 deletions admin/themes/default/css/style.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions admin/themes/default/css/style.css.map
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions admin/themes/default/items/browse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,15 @@
<?php endif; ?>

<td class="item-info">

<?php if (metadata('item', 'has files')): ?>
<?php echo link_to_item(item_image('square_thumbnail', array(), 0, $item), array('class' => 'item-thumbnail'), 'show', $item); ?>
<?php endif; ?>

<span class="title">
<?php echo link_to_item(); ?>
<?php
$linkContent = '';
if (metadata('item', 'has files')) {
$linkContent .= item_image('square_thumbnail', array('class' => 'item-thumbnail'), 0, $item);
}
$linkContent .= metadata('item', 'rich_title');
echo link_to_item($linkContent);
?>
<?php if ($item->featured): ?>
<div class="featured-icon">
<span class="featured" aria-hidden="true" title="<?php echo __('Featured'); ?>"></span>
Expand All @@ -86,7 +88,7 @@
<?php if(!$item->public): ?>
<span class="private"><?php echo __('(Private)'); ?></span>
<?php endif; ?>
</span>
</span>
<ul class="action-links group">
<?php if (is_allowed($item, 'edit')): ?>
<li>
Expand Down
14 changes: 8 additions & 6 deletions application/views/scripts/items/browse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@

<?php foreach (loop('items') as $item): ?>
<div class="item hentry">
<h2><?php echo link_to_item(null, array('class' => 'permalink')); ?></h2>
<?php
$linkContent = '';
if (metadata('item', 'has files')) {
$linkContent .= item_image(null);
}
$linkContent = metadata('item', 'rich_title');
?>
<h2><?php echo link_to_item($linkContent, array('class' => 'permalink')); ?></h2>
<div class="item-meta">
<?php if (metadata('item', 'has files')): ?>
<div class="item-img">
<?php echo link_to_item(item_image(null)); ?>
</div>
<?php endif; ?>

<?php if ($description = metadata('item', array('Dublin Core', 'Description'), array('snippet' => 250))): ?>
<div class="item-description">
Expand Down