Merge branch 'master' into develop

scrapinghub · May 31, 2017 · c05abe8 · c05abe8
2 parents 7abd396 + 92b60b8
commit c05abe8
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 12 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -4,7 +4,7 @@ Vagrant.configure("2") do |config|
 	config.vm.box = "ubuntu/trusty64"
 	config.vm.host_name = "portia"
 	config.vm.provision :shell, :path => 'provision.sh', :args => [
-		"install_deps", "install_splash", "install_python_deps", "configure_nginx", "configure_initctl", "start_portia"
+		"install_deps", "install_splash", "install_python_deps", "configure_nginx", "configure_initctl", "migrate_django_db", "start_portia"
 	]
 	config.vm.network "private_network", ip: "33.33.33.10"
 	config.vm.network "forwarded_port", guest: 9001, host: 9001

diff --git a/portiaui/app/styles/app.scss b/portiaui/app/styles/app.scss
@@ -52,6 +52,7 @@
 
 @import "variables";
 @import "generic";
+@import "document";
 
 @import "animations";
 @import "icons";

diff --git a/portiaui/app/styles/components/dropdown-delete.scss b/portiaui/app/styles/components/dropdown-delete.scss
@@ -1,7 +1,5 @@
 li.dropdown-delete {
     cursor: pointer;
-    user-select: none;
-
     a {
         color: $brand-danger;
         &:hover { color: $brand-danger; }

diff --git a/portiaui/app/styles/components/extracted-item-table.scss b/portiaui/app/styles/components/extracted-item-table.scss
@@ -1,4 +1,5 @@
 .extracted-item-table {
+    user-select: text;
     &,
     table {
         margin-bottom: $line-height-computed;

diff --git a/portiaui/app/styles/components/extracted-items-json-panel.scss b/portiaui/app/styles/components/extracted-items-json-panel.scss
@@ -8,6 +8,7 @@
     unicode-bidi: embed;
     word-break: break-all;
     word-wrap: break-word;
+    user-select: text;
 
     b {
         font-weight: normal;

diff --git a/portiaui/app/styles/components/start-url-options.scss b/portiaui/app/styles/components/start-url-options.scss
@@ -1,7 +1,3 @@
-.fragment-span {
-    margin-left: -3px;
-}
-
 .start-url-list {
     overflow-y: auto;
     min-height: 200px;
@@ -15,6 +11,7 @@
 .start-url-generation-list {
     p {
         white-space: nowrap;
+        user-select: text;
         position: relative;
         margin: 0;
     }

diff --git a/portiaui/app/styles/document.scss b/portiaui/app/styles/document.scss
@@ -0,0 +1,3 @@
+body {
+    user-select: none;
+}
diff --git a/portiaui/app/templates/components/colored-span.hbs b/portiaui/app/templates/components/colored-span.hbs
@@ -1 +1 @@
-{{yield}}
+{{~ yield ~}}
diff --git a/portiaui/app/templates/components/generated-url-options.hbs b/portiaui/app/templates/components/generated-url-options.hbs
@@ -36,11 +36,11 @@
     <section class="start-url-generation-list">
     {{#each generatedUrlLists as |generatedUrlList|}}
         <p>
-        {{#each generatedUrlList as |fragment index|}}
-            {{#colored-span class="fragment-span" color=(array-get fragmentColors index)}}
+        {{#each generatedUrlList as |fragment index| ~}}
+            {{#colored-span color=(array-get fragmentColors index) ~}}
                 {{fragment}}
-            {{/colored-span}}
-        {{/each}}
+            {{~/colored-span}}
+        {{~/each}}
         </p>
     {{/each}}
 

diff --git a/provision.sh b/provision.sh
@@ -122,6 +122,11 @@ configure_initctl(){
     cp "$APP_ROOT/portia.conf" /etc/init
 }
 
+
+migrate_django_db(){
+    python /vagrant/portia_server/manage.py migrate
+}
+
 start_portia(){
     echo "Starting Nginx"
     echo "=============="