Add support for screen-bundle (#10)

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.1.0
+
+* Added support for screen-bundle.
+
 ## 2.0.0
 
 * Symfony 3.4 version.

Resources/config/angular.yml

@@ -22,6 +22,7 @@ assets:
     - bundles/os2displayadmin/assets/libs/angular-translate.min.js
     - bundles/os2displayadmin/assets/libs/angular-translate-loader-static-files.min.js
   css:
+    - bundles/os2displayadmin/assets/build/bootstrap.min.css
     - bundles/os2displayadmin/css/colorpicker.css
     - bundles/os2displayadmin/css/jquery.datetimepicker.css
     - bundles/os2displayadmin/css/angular-tooltips.min.css

Resources/public/apps/ikApp/pages/channel/channel-step3.html

@@ -1,6 +1,8 @@
 <section class="create-channel--section">
   <div class="create-channel--content--channel-three">
     <div class="create-channel--publishing">
+      <itk-header entity="channel" type="channel" event="settings.extra-fields" ng-if="channel.id"></itk-header>
+
       <label class="create-channel--schedule-label">{{ 'create_channel.heading.scheduling' | translate }}</label>
       <div class="create-channel--schedule">
         <div class="create-channel--schedule-from">

Resources/public/apps/ikApp/pages/screen/screen-main-control-panel.html

@@ -17,11 +17,12 @@
         <label class="cpw--textarea-label">Beskrivelse</label>
         <text-area-widget field="screen.description" placeholder-text="f.eks. Bruges til mødelokale A, B og C"></text-area-widget>
       </div>
-      <div class="cpw--text" data-ng-if="screen.activation_code">
+      <div class="cpw--text">
         <label class="cpw--text-label">Aktiveringskode</label>
         <input type="text" class="cpw--text-input" readonly="readonly" data-ng-model="screen.activation_code">
       </div>
     </form>
+    <itk-header entity="screen" type="screen" event="settings.extra-fields" ng-if="screen.id"></itk-header>
     <form class="cpw--wrapper">
       <div class="cpw--text">
         <label class="cpw--text-label">Grupper</label>

Resources/public/apps/ikApp/translations/locale-da.json

@@ -33,7 +33,7 @@
     "progress_bar": {
       "step1": "Titel",
       "step2": "Rækkefølge",
-      "step3": "Planlægning",
+      "step3": "Indstillinger",
       "step4": "Grupper og gem"
     },
     "scheduling": {
@@ -100,4 +100,4 @@
       "seconds": "sekunder."
     }
   }
-}
+}

Resources/public/apps/ikShared/elements/channelOverview/channel-overview-directive.html

@@ -51,7 +51,7 @@
         </div>
 
         <div class="overview--preview">
-          <ik-channel class="overview--channel-container" ik-channel="channel" ik-width="300" ik-single-slide="false" ik-clickable="true"></ik-channel>
+          <ik-channel class="overview--channel-container" ik-channel="channel" ik-width="300" ik-single-slide="true" ik-clickable="true"></ik-channel>
           <div class="overview--preview-fadeout"></div>
         </div>
       </div>
@@ -61,6 +61,7 @@
         <span data-ng-if="displaySharingOption"><ik-channel-share ik-channel="channel"></ik-channel-share> / </span>
         <ik-delete id="{{ channel.id }}" type="channel" />
       </div>
+      <itk-header class="itk-header" entity="channel" type="channel" event="list.element"></itk-header>
     </div>
     <!-- If overlay display-->
     <div class="overview--channel" data-ng-repeat="channel in channels" data-ng-if="ikOverlay && !loading">
@@ -87,6 +88,7 @@
         <span class="overview--channel-label">{{channel.title}}</span>
         <span class="overview--slide-date">- {{channel.created_at * 1000 | date:'dd.MM.yyyy'}}</span>
       </div>
+      <itk-header class="itk-header" entity="channel" type="channel" event="list.element"></itk-header>
     </div>
     <div class="overview--section" data-ng-show="!loading" ng-if="channels.length === 0">
       Ingen resultater.

Resources/public/apps/ikShared/elements/itkHeader/itkHeader.js

@@ -41,16 +41,17 @@ angular.module('ikShared').directive('itkHeader', ['busService', '$timeout', '$c
                 busService.$on(returnEvent, function (event, data) {
                     $timeout(function () {
                         if (data.hasOwnProperty('html')) {
-                            html = html + data.html;
+                            var e = angular.element(data.html);
 
-                            var e = $compile(html)(scope);
-                            element.replaceWith(e);
+                            element.append(e);
+                            $compile(e)(scope);
                         }
                     });
                 });
 
                 busService.$emit(event + '.requestItems', {
                     entity: scope.entity,
+                    scope: scope,
                     type: scope.type,
                     returnEvent: returnEvent
                 });

Resources/public/apps/ikShared/elements/screenOverview/screen-overview-directive.html

@@ -41,7 +41,6 @@
     <div data-ng-repeat="screen in screens" class="overview--screen" data-ng-show="!loading">
       <div class="overview--screen-link">
         <div class="overview--header">
-          <itk-header entity="screen" type="screen" event="list.element"></itk-header>
           <ik-actions-menu class="overview--header-actions-menu" data-ng-if="currentUser.is_admin">
             <ul>
               <li><ik-delete id="{{ screen.id }}" type="screen"></ik-delete></li>
@@ -57,6 +56,7 @@
         <span class="overview--channel-label">{{screen.title}}</span>
         <span class="overview--slide-date">- {{ screen.created_at * 1000 | date:'dd.MM.yyyy'}}</span>
       </div>
+      <itk-header class="itk-header" entity="screen" type="screen" event="list.element"></itk-header>
     </div>
     <div class="overview--section" data-ng-show="!loading" ng-if="screens.length === 0">
       Ingen resultater.

Resources/sass/bootstrap.scss

@@ -0,0 +1,3 @@
+.bootstrap {
+  @import '../../node_modules/bootstrap/scss/bootstrap';
+}

Resources/sass/components/_itk-header.scss

@@ -0,0 +1,6 @@
+.itk-header {
+  position: absolute;
+  top: 0;
+  left: 15px;
+  width: 30px;
+}

Resources/sass/modules/_actions-menu.scss

@@ -3,7 +3,7 @@
 
   position: absolute;
   top: 0;
-  right: 1em;
+  right: 5px;
   left: auto;
 
   border: 1px solid transparent;

Resources/sass/modules/_overview.scss

@@ -445,8 +445,8 @@
 
   &--publishing-icon {
     position: absolute;
-    top: -5px; // Static since we are working within a static div anyway.
-    left: -5px;
+    top: -10px; // Static since we are working within a static div anyway.
+    right: -5px;
 
     width: 20px;
     height: 20px;

Resources/sass/styles.scss

@@ -44,6 +44,7 @@
 @import "components/_itk-menu";
 @import "components/_itk-tabs";
 @import "components/_itk-messages";
+@import "components/_itk-header";
 
 
 // Modules

gulpfile.js

@@ -1,4 +1,4 @@
-var gulp = require('gulp-help')(require('gulp'));
+var gulp = require('gulp');
 
 // Plugins.
 var jshint = require('gulp-jshint');
@@ -92,7 +92,7 @@ var sassWatchPath = 'Resources/sass/**/*.scss';
 /**
  * Process SCSS using libsass
  */
-gulp.task('sass', 'Compile sass into minified css', function () {
+gulp.task('sass', function () {
   return gulp.src(sassPath)
   .pipe(sass({
     outputStyle: 'compressed',
@@ -107,7 +107,7 @@ gulp.task('sass', 'Compile sass into minified css', function () {
 /**
  * Run Javascript through JSHint.
  */
-gulp.task('jshint', 'Runs JSHint on js', function () {
+gulp.task('jshint', function () {
   return gulp.src(adminJsPath)
   .pipe(jshint())
   .pipe(jshint.reporter(stylish));
@@ -116,7 +116,7 @@ gulp.task('jshint', 'Runs JSHint on js', function () {
 /**
  * Build single app.js file.
  */
-gulp.task('js', 'Build all custom js files into one minified js file.', function () {
+gulp.task('js', function () {
     return gulp.src(adminJsPath)
     .pipe(concat('os2displayadmin.js'))
     .pipe(ngAnnotate())
@@ -130,7 +130,7 @@ gulp.task('js', 'Build all custom js files into one minified js file.', function
 /**
  * Build single app.js file.
  */
-gulp.task('js-src', 'Report all source files for "js" task.', function () {
+gulp.task('js-src', function () {
   adminJsPath.forEach(function (path) {
     process.stdout.write(path + '\n');
   });
@@ -139,7 +139,7 @@ gulp.task('js-src', 'Report all source files for "js" task.', function () {
 /**
  * Build single assets.js file.
  */
-gulp.task('assets', 'Build all asset js files into one minified js file.', function () {
+gulp.task('assets', function () {
   return gulp.src(adminJsAssets)
   .pipe(concat('assets.js'))
   .pipe(ngAnnotate())
@@ -151,7 +151,7 @@ gulp.task('assets', 'Build all asset js files into one minified js file.', funct
 /**
  * Watch files for changes and run tasks.
  */
-gulp.task('watch', 'Starts a watch to compile sass and js. For use in development.', function () {
+gulp.task('watch', function () {
   gulp.watch(adminJsPath, ['jshint']);
   gulp.watch(sassWatchPath, ['sass']);
 });