projects
/
living-lab-site.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SwarmPlayer is now detected; CIS-LB random load balancer created
[living-lab-site.git]
/
application
/
views
/
catalog
/
videos_summary_view.php
diff --git
a/application/views/catalog/videos_summary_view.php
b/application/views/catalog/videos_summary_view.php
index
66e5f29
..
a888a5c
100644
(file)
--- a/
application/views/catalog/videos_summary_view.php
+++ b/
application/views/catalog/videos_summary_view.php
@@
-1,9
+1,9
@@
<div class="videos-summary">
<div class="videos-summary">
- <h1 class="category-title">
- <a href="<?php echo site_url("catalog/category/$category_name") ?>">
- <?php echo $category_title ?>
- </a>
+ <?php if (isset($title) && $title): ?>
+ <h1>
+ <?php echo $title ?>
</h1>
</h1>
+ <?php endif ?>
<?php
if ( isset($ordering))
<?php
if ( isset($ordering))
@@
-22,13
+22,18
@@
<?php echo $pagination ?>
<?php echo $pagination ?>
+ <?php if (count($videos) === 0): ?>
+ <p><?php echo $this->lang->line('user_no_videos_uploaded') ?></p>
+ <?php else: ?>
<?php foreach($videos as $video):
<?php foreach($videos as $video):
- $
thumb_src
= $video['thumbs'][ $video['default_thumb'] ];
+ $
default_thumb
= $video['thumbs'][ $video['default_thumb'] ];
?>
<div class="video-icon">
<div class="video-thumb ui-widget-content ui-corner-all">
<a href="<?php echo $video['video_url'] ?>">
?>
<div class="video-icon">
<div class="video-thumb ui-widget-content ui-corner-all">
<a href="<?php echo $video['video_url'] ?>">
- <img src="<?php echo $thumb_src ?>" />
+ <img class="video-thumb-img"
+ src="<?php echo $default_thumb ?>"
+ data-src='<?php echo $video['json_thumbs'] ?>' />
<div class="video-duration"><?php echo $video['duration'] ?></div>
</a>
</div>
<div class="video-duration"><?php echo $video['duration'] ?></div>
</a>
</div>
@@
-44,10
+49,11
@@
?>
</div>
<div class="video-username">
?>
</div>
<div class="video-username">
- <?php echo $this->lang->line('ui_from')
. ' TODO' //TODO ?
>
+ <?php echo $this->lang->line('ui_from')
?> <a href="<?php echo site_url("user/profile/{$video['username']}") ?>"><?php echo $video['username'] ?></a
>
</div>
</div>
<?php endforeach ?>
</div>
</div>
<?php endforeach ?>
+ <?php endif ?>
<?php echo $pagination ?>
<?php echo $pagination ?>
@@
-55,6
+61,7
@@
</div>
</div>
+<?php // TODO change ordering via AJAX ?>
<script type="text/javascript">
$(function() {
$('#ordering').change(function(e) {
<script type="text/javascript">
$(function() {
$('#ordering').change(function(e) {
@@
-66,6
+73,8
@@
window.location = uri;
});
window.location = uri;
});
+
+ $('.video-thumb-img').thumbs();
});
</script>
\ No newline at end of file
});
</script>
\ No newline at end of file