diff options
| author | Nico von Geyso <Nico.Geyso@FU-Berlin.de> | 2012-08-10 12:38:29 +0200 |
|---|---|---|
| committer | Nico von Geyso <Nico.Geyso@FU-Berlin.de> | 2012-08-10 12:38:29 +0200 |
| commit | 266d595e0dadbf187ad67e17350f5c79044cad61 (patch) | |
| tree | 62fdf0f7e81863881340c441ff02565404b81bc3 | |
| parent | 03e79716e6bb644dd7bf0d2f05670e2ae739631a (diff) | |
| download | klausuren-266d595e0dadbf187ad67e17350f5c79044cad61.tar.gz klausuren-266d595e0dadbf187ad67e17350f5c79044cad61.tar.bz2 klausuren-266d595e0dadbf187ad67e17350f5c79044cad61.zip | |
some style fixes
| -rw-r--r-- | static/style.css | 27 | ||||
| -rw-r--r-- | static/upload.js | 77 | ||||
| -rw-r--r-- | templates/layout.html | 11 |
3 files changed, 24 insertions, 91 deletions
diff --git a/static/style.css b/static/style.css index 8ff2812..7b3b094 100644 --- a/static/style.css +++ b/static/style.css @@ -1,3 +1,10 @@ +html, body { + padding: 0; + margin: 0; + height: 100%; + font: 13px/1.5 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif; +} + body { background-color: #333; } @@ -15,7 +22,7 @@ body { background-color: #fff; clear: both; height: 80px; - margin: 0px auto 5px auto; + margin: 0px auto 10px auto; } footer { @@ -31,8 +38,6 @@ footer a, footer a:visited { color: #fff; } - - #sub-header { width:100%; } @@ -47,17 +52,21 @@ footer a, footer a:visited { #header h1 { float: left; - width: 60px; + width: 50%; margin: 0px; } #header p { font-family: monospace; - float: left; - width: 550px; - text-align: left; - line-height: 80px; + text-align: right; + line-height: 180%; height: 80px; - padding: 0px; + padding: 5px; + margin: 0; +} + +#header h1 small { + color: #777; + font-size: 50%; } #header form { diff --git a/static/upload.js b/static/upload.js deleted file mode 100644 index abd264e..0000000 --- a/static/upload.js +++ /dev/null @@ -1,77 +0,0 @@ -var fileUploader = {}; - -fileUploader.init = function() { - var uploader = new plupload.Uploader({ - runtimes : 'html5,flash,html4,silverlight', - browse_button : 'pickfiles', - container : 'container', - max_file_size : '10mb', - url : '/', - flash_swf_url : '/static/plupload/js/plupload.flash.swf', - silverlight_xap_url : '/static/plupload/js/plupload.silverlight.xap', - multipart_params: {}, - filters : [ - {title : "Image files", extensions : "jpg,gif,png"}, - {title : "Data Compression", extensions : "zip,tar.gz"}, - {title : "Additional", extensions : "pdf,gs"} - ], - }); - - uploader.bind('Init', function(up, params) { - console.log("using runtime: " + params.runtime); - $('#upload-form').html('<p id="modern-form">'+ - ' <a id="pickfiles" href="#">Add files</a> |'+ - ' <a id="uploadfiles" href="#">Upload</a>'+ - '</p>'+ - '<ul id="filelist"><li>No runtime found.</li></ul>'); - $('#filelist').html('<li id="no-files">No Files Added</li>'); - - }); - - $('#uploadfiles').live('click', function(e) { - uploader.start(); - e.preventDefault(); - }); - - uploader.init(); - - uploader.bind('BeforeUpload', function(up, file) { - uploader.settings.multipart_params.tags = $('input[name='+file.id +']').val(); - }); - - uploader.bind('FilesAdded', function(up, files) { - $('#no-files').remove() - $.each(files, function(i, file) { - $('#filelist').append( - '<li id="' + file.id + '">' + - '<label for="">' + - file.name + ' (' + plupload.formatSize(file.size) + ')' + - '</label>' + - '<input type="text" placeholder="Tags (comma-separated)" name="'+file.id+'" />' + - '<b></b>' + - '</li>'); - }); - - up.refresh(); // Reposition Flash/Silverlight - }); - - uploader.bind('UploadProgress', function(up, file) { - $('#' + file.id + " input").attr('disabled', true); - $('#' + file.id + " b").html(file.percent + "%"); - }); - - uploader.bind('Error', function(up, err) { - $('#filelist').append("<div>Error: " + err.code + - ", Message: " + err.message + - (err.file ? ", File: " + err.file.name : "") + - "</div>" - ); - - up.refresh(); // Reposition Flash/Silverlight - }); - - uploader.bind('FileUploaded', function(up, file, response) { - var responseObj = jQuery.parseJSON(response.response) - $('#'+file.id).html('<a href="'+responseObj.url+'">'+file.name+'</a>'); - }); -}; diff --git a/templates/layout.html b/templates/layout.html index d5e3929..e4cacde 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -2,16 +2,17 @@ <html> <head> <meta charset="utf-8" /> - <link rel="stylesheet" href="http://960.gs/css/reset.css" /> - <link rel="stylesheet" href="http://960.gs/css/text.css" /> - <link rel="stylesheet" href="http://960.gs/css/960.css" /> <link rel="stylesheet" type="text/css" media="all" href="{{url_for('static', filename='style.css')}}" /> <title>Fit</title> </head> <body> <div id="header"> - <h1><a href="/">Fit</a></h1> - <p>git clone {{url_for('static', filename='fit.git', _external=True)}}</p> + <h1><a href="/">Archiv</a><small> @ spline</small></h1> + <p> + <b>Tip</b>: Du kannst alle Klausuren mittels Git herunterladen.<br /> + <i>git clone {{url_for('static', filename='fit.git', + _external=True)}}</i> + </p> </div> <div id="content"> |