update login button, transcode script ok

diff --git a/teleforma/static/teleforma/js/application.js b/teleforma/static/teleforma/js/application.js
index 99f355e8cb6d7193cbb9339a401ce296eb6cd7fb..fddb5a89b2c9e24327119e2701cbb969eb75b64f 100644 (file)
--- a/teleforma/static/teleforma/js/application.js
+++ b/teleforma/static/teleforma/js/application.js
@@ -32,6 +32,6 @@ rainbow.setSpectrum('#bb0000', '#e65911', '#f3ad17', 'green');
 
 $(window).ready(function() {
        var pageHeight = $(window).height();
-       var navHeight = pageHeight - 140;
+       var navHeight = pageHeight - 125;
        $('#desk_center').css({"max-height": navHeight + 'px'});
 });

diff --git a/teleforma/templates/telemeta/login.html b/teleforma/templates/telemeta/login.html
index 911529855225a38ee8393d51cc04052549d109b4..e883f5c029ad652c7c6480b7669b47632b17ef1a 100644 (file)
--- a/teleforma/templates/telemeta/login.html
+++ b/teleforma/templates/telemeta/login.html
@@ -5,6 +5,16 @@
 {% endblock %}
 
 {% block content %}
+<script>
+$(document).ready(function() {
+    $(this).keydown(function(e) {
+        if (e.keyCode == '13') {
+            $("#_loginForm").submit();
+        }
+    });
+});
+</script>
+
 {% if form.errors %}
 <p class="login-error">{% trans "Your username and password didn't match. Please try again." %}</p>
 {% endif %}
@@ -15,8 +25,10 @@
 {{ form.password.label_tag }}
 {{ form.password }}
 </p>
-<span style="align: right; font-weight: bold;"><a href="{% url telemeta-password-reset %}">{% trans "Password forgotten" %} ?</a></span>
-<input class="submit" type="submit" value="{% trans "Sign in" %}" />
+<div style="margin-top: 2em;">
+<span style="align: right; font-weight: bold; margin-right: 2em;"><a href="{% url telemeta-password-reset %}">{% trans "Password forgotten" %} ?</a></span>
+<a href="#" class="component_icon button" id="action_red" onclick="$('#_loginForm').submit();"><img src="{{STATIC_URL}}telemeta/images/password.png" alt="" style="vertical-align:middle" />&nbsp;{% trans "Sign in" %}</a>
 <input type="hidden" name="next" value="{{ next }}" />
+</div>
 </form>
 {% endblock %}

diff --git a/tools/trans/transcode.py b/tools/trans/transcode.py
index 4b7a9a5cbb5397d7d97041dea3e81e2d06677d64..b4b9214d10f9330c8e41ba19e7e4efc5d364e8c2 100755 (executable)
--- a/tools/trans/transcode.py
+++ b/tools/trans/transcode.py
@@ -1,32 +1,45 @@
 #!/usr/bin/python
 
 import os, sys, string
+import logging
 
+class Logger:
+    """A logging object"""
+
+    def __init__(self, file):
+        self.logger = logging.getLogger('myapp')
+        self.hdlr = logging.FileHandler(file)
+        self.formatter = logging.Formatter('%(message)s')
+        self.hdlr.setFormatter(self.formatter)
+        self.logger.addHandler(self.hdlr)
+        self.logger.setLevel(logging.INFO)
+
+log_file = 'transmeta.log'
+logger = Logger(log_file)
 root_dir = sys.argv[-1]
 source_format = 'webm'
-ffmpeg_args = {'mp3' : ' -vn -acodec libmp3lame -aq 6',
-               'ogg' : ' -vn -acodec copy '
-               'mp4' : ' -vcodec libx264 -vb 512k -acodec libfaac -ab 96k ' 
-              }
-
 done = []
-log_file = 'transmeta.log'
-f = open(log_file, 'r')
-for line in f.readlines():
-    done.append(line)
+ffmpeg_args = {'mp3' : ' -vn -acodec libmp3lame -aq 6 ',
+               'ogg' : ' -vn -acodec copy ',
+               'mp4' : ' -vcodec libx264 -r 24 -s 640x360 -b 512k -threads 4 -acodec libfaac -ar 48000 -ab 96k -ac 1 ',
+              }
 
+if os.path.exists(log_file):
+    f = open(log_file, 'r')
+    for line in f.readlines():
+        done.append(line[:-1])
+    f.close()
 
 for root, dirs, files in os.walk(root_dir):
     for file in files:
-        path = root + os.sep + file
+        path = os.path.abspath(root + os.sep + file)
         name, ext = os.path.splitext(file)
-        if ext == source_format:
+        if ext[1:] == source_format:
             for format in ffmpeg_args.keys():
-                dest = root + os.sep + name + format
+                dest = os.path.abspath(root + os.sep + name + '.' + format)
                 if not dest in done:
                     command = 'ffmpeg -i ' + path + ffmpeg_args[format] + ' -y ' + dest
                     os.system(command)
-                    logger.info(dest)
-
-                
+                    logger.logger.info(dest)
 
+print "DONE!"