add phpmyadmin url, prepare video sharing

diff --git a/app/deploy/nginx-app.conf b/app/deploy/nginx-app.conf
index 4aaec53a435d29ce06775a02f76496fc1b741938..ecafdd04546b1d1fb83ffaca1d6243985b1b9b43 100644 (file)
--- a/app/deploy/nginx-app.conf
+++ b/app/deploy/nginx-app.conf
@@ -20,6 +20,11 @@ server {
                alias /srv/static; # your Django project's static files - amend as required
        }
 
+       # phpmyadmin
+       location /phpmyadmin {
+               proxy_pass http://localhost:10000/;
+       }
+
        location / {
             uwsgi_pass app:8000;
             include /etc/nginx/uwsgi_params;

diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index 18c1695ca9075d77f9c7067065e82cea5a5c1908..0b3947eeec6a76f99897c58acd5820c5bd4d3e76 100644 (file)
--- a/app/deploy/start_app.sh
+++ b/app/deploy/start_app.sh
@@ -32,7 +32,7 @@ fi
 
 # static files auto update
 watchmedo shell-command --patterns="*.js;*.css" --recursive \
-    --command='python '$manage' collectstatic --noinput' $static &
+    --command='python '$manage' collectstatic --noinput' $static &  
 
 # app start
 uwsgi --socket :$port --wsgi-file $wsgi --chdir $app --master --processes $processes --threads $threads --py-autoreload $autoreload

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index d8d6b4fd5b81b9ea33b9e94a4cc0e0f32de2e800..eb252b7ce984ab538e7c2505166ef974ef9ed0d5 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -166,9 +166,14 @@
     <video width="348" height="240" controls preload="none">
         <source src="{% url "telemeta-item-export" item.public_id mime_type|mime_to_ext %}" type="{{ mime_type }}" />
     </video>
-    <div id="videotime"></div>
     </div>
 
+    <button type="button" class="btn btn-default">
+      <span class="glyphicon glyphicon-share"></span> {% trans "Share" %}
+    </button>
+
+{% comment %}
+    <div id="videotime"></div>
     <script>
     (function(){
         var v = document.getElementsByTagName('video')[0]
@@ -178,6 +183,8 @@
             },false);
             })();
     </script>
+{% endcomment %}
+
 
     {% endif %}