mirror of
https://github.com/fergalmoran/dss.web.git
synced 2026-02-15 04:25:41 +00:00
Merge branch 'release/4.0.3'
This commit is contained in:
Fergal Moran
37
client/app/components/comments/comments.html
Normal file
37
client/app/components/comments/comments.html
Normal file
@@ -0,0 +1,37 @@
|
||||
<div class="panel">
|
||||
<div class="panel-heading">
|
||||
Comments
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<ul class="media-list media-feed media-feed-hover">
|
||||
<li>
|
||||
<section class="panel">
|
||||
<form>
|
||||
<textarea placeholder="Rate me, validate me, trash me?" rows="2"
|
||||
class="form-control input-lg p-text-area" ng-model="newComment">
|
||||
</textarea>
|
||||
</form>
|
||||
<footer class="panel-footer" style="height: 64px;">
|
||||
<button class="btn btn-danger pull-right" ng-click="postComment()" >Post</button>
|
||||
</footer>
|
||||
</section>
|
||||
</li>
|
||||
<li ng-repeat="comment in comments" ng-animate="'animate'" class="media"><a class="pull-left"><img ng-src="{{comment.avatar_image}}" alt="{{comment.user.display_name}}" class="img-circle user-profile-insert-medium"/></a>
|
||||
<div class="media-body">
|
||||
<p class="push-bit">
|
||||
<span class="text-muted pull-right">
|
||||
<small>{{comment.date_created|humanise}}</small>
|
||||
</span>
|
||||
<strong><a ui-sref="root.user({user: comment.slug})">{{comment.display_name}}</a> commented.</strong>
|
||||
</p>
|
||||
<p>{{comment.comment}}</p>
|
||||
<p ng-if="comment.can_edit">
|
||||
<a ng-click="deleteComment(comment)" class="btn btn-xs btn-default">
|
||||
<i class="fa fa-remove"></i> Delete
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,45 +0,0 @@
|
||||
.block
|
||||
.block-title
|
||||
h2
|
||||
strong Comments
|
||||
.block-content-full
|
||||
// You can remove the class .media-feed-hover if you don't want each event to be highlighted on mouse hover
|
||||
ul.media-list.media-feed.media-feed-hover
|
||||
li.media
|
||||
form.form-horizontal
|
||||
.form-group
|
||||
.col-xs-12
|
||||
textarea.form-control(ng-model="newComment" rows='4' placeholder='Compose a comment..')
|
||||
.form-group
|
||||
.col-xs-6
|
||||
.btn-group(ng-show="false")
|
||||
button.btn.btn-default(type='button' tooltip data-toggle='tooltip' title='Add Image')
|
||||
i.fa.fa-picture-o
|
||||
button.btn.btn-default(type='button' tooltip data-toggle='tooltip' title='Add Location')
|
||||
i.fa.fa-location-arrow
|
||||
button.btn.btn-default(type='button' tooltip data-toggle='tooltip' title='Add Recording')
|
||||
i.fa.fa-microphone
|
||||
.col-xs-6.text-right
|
||||
button.btn.btn-default(type='submit' ng-click="postComment()")
|
||||
i.fa.fa-pencil
|
||||
| POST
|
||||
li.media(ng-repeat="comment in comments" ng-animate="'animate'")
|
||||
a.pull-left()
|
||||
img.img-circle.user-profile-insert-medium(ng-src='{{comment.avatar_image}}', alt='{{comment.user.display_name}}')
|
||||
.media-body
|
||||
p.push-bit
|
||||
span.text-muted.pull-right
|
||||
small {{comment.date_created|humanise}}
|
||||
span.text-info()
|
||||
i.fa.fa-globe
|
||||
strong
|
||||
a(ui-sref='root.user({user: comment.slug})') {{comment.display_name}}
|
||||
| commented.
|
||||
p {{comment.comment}}
|
||||
p
|
||||
a.btn.btn-xs.btn-default(href='javascript:void(0)')
|
||||
i.fa.fa-thumbs-o-up
|
||||
| Like
|
||||
a.btn.btn-xs.btn-default(ng-click='deleteComment(comment)')
|
||||
i.fa.fa-remove
|
||||
| Delete
|
||||
@@ -7,7 +7,7 @@
|
||||
</div>
|
||||
<div class="top-nav visible-md visible-lg">
|
||||
<ul class="nav top-menu top-nav-buttons">
|
||||
<li id="navbar-upload-button">
|
||||
<li id="navbar-upload-button" ng-show="$root.currentUser">
|
||||
<a ui-sref="root.upload">
|
||||
<i class="fa fa-cloud-upload"></i>
|
||||
<span>Upload</span>
|
||||
|
||||
@@ -8,44 +8,54 @@
|
||||
<dss-waveform class="hidden-xs"></dss-waveform>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row pull-right">
|
||||
<div class="btn-group btn-group-xs">
|
||||
<button ng-click="shareEmbed()" class="btn btn-small"><i
|
||||
class="fa fa-wordpress blue"></i></button>
|
||||
<button ng-click="shareFacebook()" class="btn btn-small"><i
|
||||
class="fa fa-facebook-square blue"></i></button>
|
||||
<button class="btn btn-small">
|
||||
<i ng-click="shareTwitter()" class="fa fa-twitter-square"></i>
|
||||
</button>
|
||||
<div class="row">
|
||||
<div class="pull-left fb-user-details">
|
||||
<a ui-sref="root.user({user: mix.user.slug})">{{mix.user.display_name}}</a>
|
||||
</div>
|
||||
<div class="btn-group btn-group-xs">
|
||||
<button uib-tooltip="Plays" class="btn btn-small">
|
||||
<i class="fa fa-play-circle"></i>
|
||||
{{ mix.plays.length }}
|
||||
</button>
|
||||
<button ng-show="$root.currentUser && mix.is_downloadable" ng-click="downloadFile()"
|
||||
uib-tooltip="Download"
|
||||
class="btn btn-sm">
|
||||
<i class="fa fa-download"></i>
|
||||
{{ mix.downloads.length }}
|
||||
</button>
|
||||
<button ng-show="!$root.currentUser && mix.is_downloadable" uib-tooltip="Login to download"
|
||||
ng-click="login()" class="btn btn-sm">
|
||||
<i class="fa fa-download"></i>
|
||||
{{ mix.downloads.length }}
|
||||
</button>
|
||||
<a ng-click="toggleLike()"
|
||||
ng-class="mix.is_liked ? 'btn-danger' : 'btn-success'"
|
||||
uib-tooltip="{{mix.is_liked ? 'Unlike' : 'Like'}}"
|
||||
class="btn btn-alt btn-sm btn-default"><i
|
||||
class="fa fa-heart"></i>{{ mix.likes.length }}
|
||||
</a>
|
||||
</div>
|
||||
<div class="btn-group btn-group-xs">
|
||||
<button ng-click="editMix(mix)" class="btn btn-small btn-success"><i class="fa fa-pencil-square-o"></i>Edit
|
||||
</button>
|
||||
<button ng-click="deleteMix(mix)" class="btn btn-small btn-danger"><i class="fa fa-times"></i>Delete
|
||||
</button>
|
||||
<div class="pull-right">
|
||||
<div class="btn-group btn-group-xs">
|
||||
<button ng-click="shareEmbed()" class="btn btn-small" uib-tooltip="Get embed codes">
|
||||
<i class="fa fa-wordpress blue"></i>
|
||||
</button>
|
||||
<button ng-click="shareFacebook()" class="btn btn-small" uib-tooltip="Share to Facebook">
|
||||
<i class="fa fa-facebook-square blue"></i>
|
||||
</button>
|
||||
<button class="btn btn-small" uib-tooltip="Share to Twitter">
|
||||
<i ng-click="shareTwitter()" class="fa fa-twitter-square"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div class="btn-group btn-group-xs">
|
||||
<button uib-tooltip="Plays" class="btn btn-small">
|
||||
<i class="fa fa-play-circle"></i>
|
||||
{{ mix.plays.length }}
|
||||
</button>
|
||||
<button ng-show="$root.currentUser && mix.is_downloadable" ng-click="downloadFile()"
|
||||
uib-tooltip="Download"
|
||||
class="btn btn-sm">
|
||||
<i class="fa fa-download"></i>
|
||||
{{ mix.downloads.length }}
|
||||
</button>
|
||||
<button ng-show="!$root.currentUser && mix.is_downloadable" uib-tooltip="Login to download"
|
||||
ng-click="login()" class="btn btn-sm">
|
||||
<i class="fa fa-download"></i>
|
||||
{{ mix.downloads.length }}
|
||||
</button>
|
||||
</div>
|
||||
<div class="btn-group btn-group-xs" ng-show="$root.currentUser">
|
||||
<a ng-click="toggleLike()"
|
||||
ng-class="mix.is_liked ? 'btn-danger' : 'btn-success'"
|
||||
uib-tooltip="{{mix.is_liked ? 'Unlike' : 'Like'}}"
|
||||
class="btn btn-alt btn-sm btn-default">
|
||||
<i class="fa fa-heart"></i>{{ mix.likes.length }}
|
||||
</a>
|
||||
</div>
|
||||
<div class="btn-group btn-group-xs" ng-if="mix.can_edit">
|
||||
<button ng-click="editMix(mix)" class="btn btn-small btn-success"><i
|
||||
class="fa fa-pencil-square-o"></i>Edit
|
||||
</button>
|
||||
<button ng-click="deleteMix(mix)" class="btn btn-small btn-danger"><i class="fa fa-times"></i>Delete
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
22
client/app/views/mixes/item/mix.html
Normal file
22
client/app/views/mixes/item/mix.html
Normal file
@@ -0,0 +1,22 @@
|
||||
<div class="row mix-audio-container">
|
||||
<div id="mix-audio-container" class="col-md-12">
|
||||
<dss-audio-player template="directives/audio/audio.player.html"></dss-audio-player>
|
||||
</div>
|
||||
</div>
|
||||
<hr />
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<section class="panel">
|
||||
<header class="panel-heading">
|
||||
{{mix.title}}
|
||||
</header>
|
||||
<div class="panel-body">
|
||||
<span ng-bind-html="mix.description | dssHtml"></span>
|
||||
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<dss-comments></dss-comments>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,15 +0,0 @@
|
||||
.row.mix-audio-container
|
||||
.col-md-12#mix-audio-container
|
||||
dss-audio-player(template='directives/audio/audio.player.html')
|
||||
.row
|
||||
.col-sm-6
|
||||
.block.full.dss-mix-item
|
||||
.block-title
|
||||
.block-options.pull-right
|
||||
a.btn.btn-sm.btn-alt.btn-default(data-toggle='tooltip', title='Description' ng-show="false")
|
||||
i.fa.fa-ticket
|
||||
h2
|
||||
strong Description
|
||||
span(ng-bind-html='mix.description | dssHtml')
|
||||
.col-sm-6
|
||||
dss-comments
|
||||
@@ -110,7 +110,7 @@
|
||||
}
|
||||
|
||||
.image-container {
|
||||
height: 142px;
|
||||
height: 160px;
|
||||
//background-repeat: no-repeat;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dssweb",
|
||||
"version": "4.0.2",
|
||||
"version": "4.0.3",
|
||||
"main": "server/app.js",
|
||||
"dependencies": {
|
||||
"body-parser": "~1.5.0",
|
||||
|
||||
Reference in New Issue
Block a user