Merge branch 'release/1.0.0'

.gitignore

@@ -10,10 +10,13 @@ lib-cov
 pids
 logs
 results
-.idea
+.idea/workspace.xml
 
 npm-debug.log
 node_modules
+bower_components
 
 build
 cache
+app/js/bundle*
+app/css/bundle*

Gruntfile.js

@@ -11,12 +11,76 @@ module.exports = function(grunt) {
                 appName: 'Freeswitch Desktop',
                 version: '0.12.0',
                 buildDir: './build',
-                platforms: [ 'osx64' /*, 'win','osx', 'linux32', 'linux64' */],
-                winIco: "src/images/icon.ico",
+                platforms: [ 'osx64', 'linux64' ],
+                winIco: "app/images/icon.ico",
                 macZip: true,
-                macIcns: "src/images/icon.icns"
+                macIcns: "app/images/icon.icns"
             },
-            src: ['./src/**/*']
+            src: ['./app/**/*']
+        },
+
+        uglify: {
+            options: {
+                sourceMap: true,
+                sourceMapIncludeSources: true
+            },
+            all: {
+                files: {
+                    'app/js/bundle-header.js': [
+                        'bower_components/modernizr/modernizr.js'
+                    ],
+                    'app/js/bundle.js': [
+                        'bower_components/jquery/dist/jquery.js',
+                        'bower_components/bootstrap/dist/js/bootstrap.js',
+                        'bower_components/jquery-growl/javascripts/jquery.growl.js',
+                        'bower_components/moment/moment.js',
+                        'bower_components/angular/angular.js',
+                        'bower_components/angular-sanitize/angular-sanitize.js',
+                        'bower_components/angular-resource/angular-resource.js',
+                        'bower_components/angular-ui-router/release/angular-ui-router.js',
+                        'src/js/controllers/main.js',
+                        'src/js/controllers/conferences.js',
+                        'src/js/directives/ngConfirmClick.js',
+                        'src/js/directives/ngMomentAgo.js',
+                        'src/js/directives/ngModalClose.js',
+                        'src/js/directives/ngPopover.js',
+                        'src/js/services/AllSettled.js',
+                        'src/js/services/LocalStorageService.js',
+                        'src/js/services/GrowlService.js',
+                        'src/js/services/freeswitch/FreeswitchRouter.js',
+                        'src/js/services/freeswitch/FreeswitchClient.js',
+                        'src/js/services/freeswitch/parsers/ListParser.js',
+                        'src/js/services/freeswitch/models/Member.js',
+                        'src/js/services/freeswitch/models/Conference.js',
+                        'src/js/services/freeswitch/models/Server.js'
+                    ]
+                }
+            }
+        },
+
+        less: {
+            options: {
+                compress: true,
+                cleancss: true,
+                sourceMap: true,
+                //sourceMapFilename: 'web/public/bundles/stylesheets/shared/layout.css.map',
+                //sourceMapBasepath: "web/public/bundles/stylesheets/shared/",
+                //sourceMapURL: 'layout.css.map'
+            },
+            all: {
+                files: {
+                    'app/css/bundle.css': 'src/css/app.less'
+                }
+            }
+        },
+
+        clean: {
+            all: {
+                src: [
+                    'app/js/bundle-header.js.map',
+                    'app/js/bundle.js.map'
+                ]
+            }
         },
 
         exec: {
@@ -35,8 +99,12 @@ module.exports = function(grunt) {
 
     grunt.loadNpmTasks('grunt-node-webkit-builder');
     grunt.loadNpmTasks('grunt-exec');
-    grunt.registerTask('build', ['nodewebkit']);
-    grunt.registerTask('run', ['build', 'exec:mac']);
+    grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-newer');
+    grunt.loadNpmTasks('grunt-contrib-clean');
+    grunt.loadNpmTasks('grunt-contrib-less');
+    grunt.registerTask('bundle', ['newer:uglify', 'newer:less']);
+    grunt.registerTask('build', ['bundle', 'clean', 'nodewebkit']);
     grunt.registerTask('run:linux', ['build', 'exec:linux']);
     grunt.registerTask('run:mac', ['build', 'exec:mac']);
     grunt.registerTask('default', []);

README.md

@@ -1,7 +1,11 @@
 fs-mgmt
 =======
 
-Freeswitch desktop management application
+Simple Freeswitch desktop management application
+
+#binaries
+
+Binaries for every platform are available on the [releases page](https://github.com/pablote/fs-mgmt/releases)
 
 #binaries
 

src/html/conferences/main.html → app/html/conferences/main.html

@@ -9,6 +9,7 @@ <h4>SETTINGS</h4>
                 <label>Servers</label>
                 <ul class="server-list">
                     <li class="server-list-item" ng-repeat="server in settings.serverList track by server.name">
+                        <input type="checkbox" ng-model="server.enabled" ng-disabled="autoRefresh" />
                         {{ server.name }}
                         <div class="server-list-item-remove" ng-click="removeServer(server)" ng-show="!autoRefresh">
                             <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
@@ -34,7 +35,7 @@ <h4>SETTINGS</h4>
                 <label for="inputAutoRefreshInterval">Auto refresh (in seconds)</label>
 
                 <div class="input-group">
-                    <input ng-model="settings.autoRefreshInterval" type="text" class="form-control" id="inputAutoRefreshInterval">
+                    <input ng-model="settings.autoRefreshInterval" ng-disabled="autoRefresh" type="text" class="form-control" id="inputAutoRefreshInterval">
 
                     <span class="input-group-btn">
                         <button ng-click="toggleAutoRefresh()" class="btn btn-success" ng-class="{ active: isAutoRefreshEnabled }">

app/html/main.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html class="height-all">
+    <head>
+        <title>Freeswitch Desktop</title>
+        <link rel="stylesheet" href="../css/bundle.css" />
+        <script src="../js/bundle-header.js"></script>
+    </head>
+    <body ng-app="fsmgmt.controllers.main" ng-controller="MainController" class="ng-cloak height-all">
+        <div ui-view class="height-all">
+        </div>
+
+        <!--
+            Message Dialog
+        -->
+        <div ng-modal-close="onModalClose()" id="dlgMessage" class="modal fade">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                        <h4 class="modal-title">{{ messageDialog.title }}</h4>
+                    </div>
+                    <div class="modal-body">
+                        <p>{{ messageDialog.text }}</p>
+                        <pre ng-show="messageDialog.preText">{{ messageDialog.preText }}</pre>
+                        <a ng-show="messageDialog.details" data-toggle="collapse" href="#dlgMessageDetails">View details</a>
+                        <div ng-show="messageDialog.details" class="collapse" id="dlgMessageDetails">
+                            <pre>{{ messageDialog.details | json }}</pre>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    </div>
+                </div><!-- /.modal-content -->
+            </div><!-- /.modal-dialog -->
+        </div><!-- /.modal -->
+
+        <script src="../js/bundle.js"></script>
+    </body>
+</html>

src/package.json → app/package.json

@@ -1,7 +1,7 @@
 {
     "name": "fs-mgmt",
     "description": "Freeswitch management desktop application",
-    "version": "0.5.0",
+    "version": "1.0.0",
     "main": "html/main.html",
     "window": {
         "title": "Freeswitch Desktop",

bower.json

@@ -0,0 +1,26 @@
+{
+  "name": "fs-mgmt",
+  "homepage": "https://github.com/pablote/fs-mgmt",
+  "authors": [
+    "Pablo Compagni <[email protected]>"
+  ],
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": "~2.1.4",
+    "bootstrap": "~3.3.4",
+    "modernizr": "~2.8.3",
+    "moment": "~2.10.2",
+    "jquery-growl": "~1.2.5",
+    "angular": "~1.3.15",
+    "angular-sanitize": "~1.3.15",
+    "angular-resource": "~1.3.15",
+    "angular-ui-router": "~0.2.14",
+    "startbootstrap-simple-sidebar": "IronSummitMedia/startbootstrap-simple-sidebar#~1.0.4"
+  }
+}

package.json

@@ -1,10 +1,19 @@
 {
-    "name": "fs-mgmt-build",
-    "version": "1.0.0",
-    "dependencies": {},
-    "devDependencies": {
-        "grunt": "~0.4.5",
-        "grunt-node-webkit-builder": "~1.0.2",
-        "grunt-exec": "~0.4.6"
-    }
-}
+  "name": "fs-mgmt-build",
+  "version": "1.0.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pablote/fs-mgmt"
+  },
+  "dependencies": {
+  },
+  "devDependencies": {
+    "grunt": "^0.4.5",
+    "grunt-contrib-clean": "^0.6.0",
+    "grunt-contrib-uglify": "^0.9.1",
+    "grunt-exec": "^0.4.6",
+    "grunt-newer": "^1.1.0",
+    "grunt-node-webkit-builder": "^1.0.2",
+    "grunt-contrib-less": "^1.0.1"
+  }
+}