Merge branch 'dev' of https://github.com/kiswa/TaskBoard into dev

ildaroit · Jul 29, 2015 · e6cd183 · e6cd183
2 parents 72dfe4e + d8efdab
commit e6cd183
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 2 deletions.
diff --git a/api/boardRoutes.php b/api/boardRoutes.php
@@ -76,6 +76,7 @@
             }
             R::trashAll($board->xownLane);
             R::trashAll($board->xownCategory);
+            R::trashAll($board->xownAutoaction);
             R::trash($board);
             R::exec('DELETE from board_user WHERE board_id = ?', [$data->boardId]);
             $jsonResponse->addAlert('success', 'Removed board ' . $board->name . '.');

diff --git a/build/Vagrantfile b/build/Vagrantfile
@@ -0,0 +1,27 @@
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/trusty32"
+  config.vm.network "forwarded_port", guest: 80, host: 8080
+  config.vm.synced_folder "../", "/taskboard"
+  config.vm.provision "shell", inline: <<-SHELL
+    sudo apt-get update
+    sudo apt-get install -y curl php5 php5-cli php5-sqlite sqlite3 apache2 libapache2-mod-php5
+    sudo apt-get clean
+    sudo a2enmod rewrite
+    sudo a2enmod expires
+    echo "<VirtualHost *:80>
+        ServerAdmin webmaster@localhost
+        DocumentRoot /taskboard
+        ErrorLog /var/log/apache2/error.log
+        CustomLog /var/log/apache2/access.log combined
+        <Directory /taskboard>
+                AllowOverride All
+                Options All
+                Require all granted
+        </Directory>
+</VirtualHost>" > /etc/apache2/sites-enabled/000-default.conf
+    sudo service apache2 restart
+    curl -sS https://getcomposer.org/installer | php
+    mv composer.phar /usr/local/bin/composer
+    cd /taskboard && composer install
+  SHELL
+end
diff --git a/css/styles.css b/css/styles.css
@@ -315,6 +315,9 @@ textarea {
     margin: 5px;
     text-align: right;
 }
+.addItem input {
+    width: 90% !important;
+}
 .draggable-placeholder {
     height: 80px;
     box-shadow: inset 0px 0px 10px 0px rgba(51,51,51,.25);

diff --git a/js/controllers/boards.js b/js/controllers/boards.js
@@ -16,6 +16,10 @@ function ($scope, $routeParams, $location, $interval, $window,
         $location.path(path);
     }
 
+    $scope.quickAdd = {
+        title: []
+    };
+
     $scope.alerts = AlertService;
     $scope.marked = function(text) {
         if (text) {

diff --git a/js/controllers/boardsItemForm.js b/js/controllers/boardsItemForm.js
@@ -39,6 +39,17 @@ function ($scope, BoardService) {
             $('.itemModal').on('hidden.bs.modal', function (e) {
                 that.reset();
             });
+            if ($scope.quickAdd.title[laneId]) {
+                this.quickAddItem(laneId);
+            }
+        },
+        quickAddItem: function(laneId) {
+            $('.itemModal').on('show.bs.modal', function(e) {
+                e.stopPropogation();
+            });
+            this.title = $scope.quickAdd.title[laneId];
+            $scope.submitItem(this);
+            delete $scope.quickAdd.title[laneId];
         },
         loadItem: function(item) {
             this.reset(item.lane_id);

diff --git a/partials/board.html b/partials/board.html
@@ -82,8 +82,9 @@ <h4>{{ item.title }}</h4>
                             </span>
                         </p>
                     </div>
-                    <div class="addItem">
-                        <a role="button" class="btn btn-default fa fa-plus" data-toggle="modal"
+                    <div class="addItem form-inline">
+                        <input class="form-control" type="text" data-ng-model="quickAdd.title[lane.id]" placeholder="Quick Add Item Title - Leave Blank for Dialog">
+                        <a role="button" class="btn btn-default fa fa-plus form-control" data-toggle="modal"
                            data-target=".itemModal" data-ng-click="itemFormData.reset(lane.id)" title="Add Item"></a>
                     </div>
                     <span data-on-load-callback="updateSortables"></span>