Merge branch 'playlists' of https://github.com/takeit/Newscoop into takeit-playlists

Author: ahilles107

newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/playlists/controllers/playlists.js

@@ -162,6 +162,14 @@ angular.module('playlistsApp').controller('PlaylistsController', [
             {number: $scope.articlePreview.number}
             );
 
+        if (isLimitReached()) {
+            flashMessage(Translator.trans(
+                    'List limit reached! Remove some articles from the list before adding new ones.'
+            ), 'error');
+
+            return true;
+        }
+
         if (!exists) {
             var isInLogList = _.some(
                 Playlist.getLogList(),
@@ -187,6 +195,14 @@ angular.module('playlistsApp').controller('PlaylistsController', [
             {number: number}
             );
 
+        if (isLimitReached()) {
+            flashMessage(Translator.trans(
+                    'List limit reached! Remove some articles from the list before adding new ones.'
+            ), 'error');
+
+            return true;
+        }
+
         if (!exists) {
             var article = undefined,
             isInLogList;
@@ -214,6 +230,17 @@ angular.module('playlistsApp').controller('PlaylistsController', [
         flashMessage(Translator.trans('Item already exists in the list'), 'error');
     };
 
+    /**
+     * Checks if playlist's limit is reached.
+     *
+     * @return {Boolean}
+     */
+    var isLimitReached = function () {
+        var limit = $scope.playlist.selected.maxItems;
+
+        return (limit && limit != 0 && $scope.featuredArticles.length >= limit);
+    }
+
     /**
      * Saves playlist from the article edit screen view
      */

newscoop/src/Newscoop/NewscoopBundle/Resources/translations/articles.en.yml

@@ -189,6 +189,7 @@ Comments: Comments
 'This list is already in a different state than the one in which it was loaded.': 'This list is already in a different state than the one in which it was loaded.'
 'List name should not be longer than 40 chars': 'List name should not be longer than 40 chars'
 'Not valid number': 'Not valid number'
+'List limit': 'List limit'
 articles:
     playlists:
         alert: 'Are you sure you want to change the maximum number of articles for this featured article list? If you decrease the limit, all articles beyond this limit will be deleted. Example: If you change the limit from 50 to 30 articles all 20 articles starting from position number 31 till 50 will be deleted from the list. Maybe the example is too much'

newscoop/src/Newscoop/NewscoopBundle/Resources/views/Playlists/index.html.twig

@@ -224,17 +224,20 @@
                 </div>
                 {% endif %}
                 <div ng-controller="FeaturedController">
-                    <div ng-if="!$parent.isViewing" class="context-block context-list plugin-context-block" {% if editorView %}style="width: 620px;"{% endif %}>
+                    <div ng-if="!$parent.isViewing" class="context-block context-list plugin-context-block" {% if editorView %}style="width: 643px;"{% endif %}>
                         <div class="row">
                             <div class="col-xs-6"><h3 style="display:inline">{[{ playlist.selected.title}]}</h3></div>
-                            {% if editorView == false %}<div class="col-xs-6" ng-if="playlist.selected">
-                                <form name="limitForm" class="limit-input">
-                                <label id="playlist-id-label">{{ 'List limit'|trans}}:</label>
+                            <div class="col-xs-6" ng-if="playlist.selected">
+                            <form name="limitForm" class="limit-input">
+                            <label id="playlist-id-label">{{ 'List limit'|trans}}:</label>
+                            {% if editorView == false %}
                                 <input ng-change="updateParentLimit(this)" type="number" name="input" ng-model="playlist.selected.maxItems" min="0" max="99" class="form-control input-sm" id="playlistId">
                                 <span class="error-custom" ng-show="limitForm.input.$error.number">{{ 'Not valid number'|trans}}!</span>
-                                </form>
-                            </div>
+                            {% else %}
+                            	<span style="line-height: 28px;">{[{ playlist.selected.maxItems }]}</span>
                             {% endif %}
+                            </form>
+                            </div>
                         </div>
                         <div class="context-list-results" >
                             <div style="display: block">
@@ -247,7 +250,7 @@
                                         </div>
                                         {% endif %}
                                         <li class="item" ng-repeat="article in $parent.featuredArticles">
-                                            <div class="context-item" {% if editorView %}style="width: 580px"{% endif %} >
+                                            <div class="context-item" {% if editorView %}style="width: 620px"{% endif %} >
                                                 <div class="context-drag-topics"><a href="#" title="drag to sort"></a></div>
                                                 <div class="context-item-header">
                                                     <div class="context-item-date">{[{::article.created| date:"dd.MM.yyyy 'at' H:mm:ss"}]}