From 9f85e80188185b01c92f5f74343944e96382366d Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 9 Jul 2013 19:21:18 +0200 Subject: adapted to pyload-common repo --- pyload/web/Gruntfile.js | 41 +- pyload/web/app/favicon.ico | Bin 6006 -> 0 bytes pyload/web/app/fonts/Sansation_1.31_ReadMe.txt | 18 - pyload/web/app/fonts/Sansation_Bold-webfont.eot | Bin 35336 -> 0 bytes pyload/web/app/fonts/Sansation_Bold-webfont.ttf | Bin 35160 -> 0 bytes pyload/web/app/fonts/Sansation_Bold-webfont.woff | Bin 18496 -> 0 bytes pyload/web/app/fonts/Sansation_Light-webfont.eot | Bin 36700 -> 0 bytes pyload/web/app/fonts/Sansation_Light-webfont.ttf | Bin 36520 -> 0 bytes pyload/web/app/fonts/Sansation_Light-webfont.woff | Bin 18408 -> 0 bytes pyload/web/app/fonts/Sansation_Regular-webfont.eot | Bin 36368 -> 0 bytes pyload/web/app/fonts/Sansation_Regular-webfont.ttf | Bin 36180 -> 0 bytes .../web/app/fonts/Sansation_Regular-webfont.woff | Bin 18316 -> 0 bytes pyload/web/app/images/default/bgpattern.png | Bin 2487 -> 0 bytes pyload/web/app/images/default/fancy_deboss.png | Bin 265 -> 0 bytes pyload/web/app/images/default/logo.png | Bin 5329 -> 0 bytes pyload/web/app/images/default/logo_grey.png | Bin 1141 -> 0 bytes pyload/web/app/index.html | 1 - pyload/web/app/scripts/config.js | 2 +- pyload/web/app/scripts/vendor/bootstrap-2.3.2.js | 2291 -------------------- pyload/web/app/styles/default/base.less | 168 -- pyload/web/app/styles/default/common.less | 90 - pyload/web/app/styles/default/main.less | 10 + pyload/web/app/styles/default/style.less | 106 +- pyload/web/app/styles/font.css | 33 - pyload/web/bower.json | 5 +- 25 files changed, 54 insertions(+), 2711 deletions(-) delete mode 100644 pyload/web/app/favicon.ico delete mode 100755 pyload/web/app/fonts/Sansation_1.31_ReadMe.txt delete mode 100644 pyload/web/app/fonts/Sansation_Bold-webfont.eot delete mode 100644 pyload/web/app/fonts/Sansation_Bold-webfont.ttf delete mode 100644 pyload/web/app/fonts/Sansation_Bold-webfont.woff delete mode 100644 pyload/web/app/fonts/Sansation_Light-webfont.eot delete mode 100644 pyload/web/app/fonts/Sansation_Light-webfont.ttf delete mode 100644 pyload/web/app/fonts/Sansation_Light-webfont.woff delete mode 100644 pyload/web/app/fonts/Sansation_Regular-webfont.eot delete mode 100644 pyload/web/app/fonts/Sansation_Regular-webfont.ttf delete mode 100644 pyload/web/app/fonts/Sansation_Regular-webfont.woff delete mode 100644 pyload/web/app/images/default/bgpattern.png delete mode 100644 pyload/web/app/images/default/fancy_deboss.png delete mode 100644 pyload/web/app/images/default/logo.png delete mode 100644 pyload/web/app/images/default/logo_grey.png delete mode 100755 pyload/web/app/scripts/vendor/bootstrap-2.3.2.js delete mode 100644 pyload/web/app/styles/default/base.less delete mode 100644 pyload/web/app/styles/default/common.less diff --git a/pyload/web/Gruntfile.js b/pyload/web/Gruntfile.js index 220b216a8..aa2077c0c 100644 --- a/pyload/web/Gruntfile.js +++ b/pyload/web/Gruntfile.js @@ -40,7 +40,7 @@ module.exports = function(grunt) { }, files: [ '<%= yeoman.app %>/**/*.html', - '{.tmp,<%= yeoman.app %>}/styles/**/*.css', + '{<%= yeoman.app %>}/styles/**/*.css', '{.tmp,<%= yeoman.app %>}/scripts/**/*.js', '<%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}' ] @@ -124,7 +124,8 @@ module.exports = function(grunt) { }, less: { options: { - paths: [yeomanConfig.app + '/components', yeomanConfig.app + '/styles', yeomanConfig.app + '/styles/default'] + paths: [yeomanConfig.app + '/components', yeomanConfig.app + '/components/pyload-common/styles', + yeomanConfig.app + '/styles/default'] //dumpLineNumbers: true }, dist: { @@ -133,7 +134,7 @@ module.exports = function(grunt) { expand: true, // Enable dynamic expansion. cwd: '<%= yeoman.app %>/styles/', // Src matches are relative to this path. src: ['**/main.less'], // Actual pattern(s) to match. - dest: '.tmp/styles/', // Destination path prefix. + dest: '.tmp/styles', // Destination path prefix. ext: '.css' // Dest filepaths will have this extension. } ] @@ -161,7 +162,7 @@ module.exports = function(grunt) { wrap: true, // Delete already included files from dist - // TODO: Fpr multiple mdulules it would delete to much files + // TODO: For multiple modules it would delete to much files done: function(done, output) { var root = path.join(path.resolve('.'), yeomanConfig.app); var parse = require('rjs-build-analysis').parse(output); @@ -297,12 +298,12 @@ module.exports = function(grunt) { // Put files not handled in other tasks here copy: { // Copy files from third party libraries - libs: { + stageComponents: { files: [ { expand: true, flatten: true, - cwd: '<% yeoman.app %>', + cwd: '<%= yeoman.app %>', dest: '.tmp/fonts', src: [ '**/font-awesome/font/*' @@ -311,13 +312,23 @@ module.exports = function(grunt) { { expand: true, flatten: true, - cwd: '<% yeoman.app %>', + cwd: '<%= yeoman.app %>', dest: '.tmp/vendor', src: [ '**/select2/select2.{png,css}', '**/select2/select2-spinner.gif', '**/select2/select2x2.png' ] + }, + { + expand: true, + cwd: '<%= yeoman.app %>/components/pyload-common', + dest: '.tmp', + src: [ + 'favicon.ico', + 'images/*', + 'fonts/*' + ] } ] }, @@ -337,15 +348,6 @@ module.exports = function(grunt) { 'styles/**/*.css', 'fonts/*' ] - }, - { - expand: true, - cwd: '.tmp/', - dest: '<%= yeoman.dist %>/', - src: [ - 'fonts/*', - '**/*.{css,gif,png,js,html}' - ] } ] }, @@ -355,10 +357,11 @@ module.exports = function(grunt) { { expand: true, cwd: '.tmp/', - dest: '<%= yeoman.dist %>/', + dest: '<%= yeoman.dist %>', src: [ 'fonts/*', - '**/*.{css,gif,png,js,html}' + 'images/*', + '**/*.{css,gif,png,js,html,ico}' ] } ] @@ -366,7 +369,7 @@ module.exports = function(grunt) { }, concurrent: { server: [ - 'copy:libs', + 'copy:stageComponents', 'less' ], test: [ diff --git a/pyload/web/app/favicon.ico b/pyload/web/app/favicon.ico deleted file mode 100644 index d7f9f1857..000000000 Binary files a/pyload/web/app/favicon.ico and /dev/null differ diff --git a/pyload/web/app/fonts/Sansation_1.31_ReadMe.txt b/pyload/web/app/fonts/Sansation_1.31_ReadMe.txt deleted file mode 100755 index d7da0f8fb..000000000 --- a/pyload/web/app/fonts/Sansation_1.31_ReadMe.txt +++ /dev/null @@ -1,18 +0,0 @@ -Sansation - freeware font family -Version 1.31 -Bernd Montag © 2011 - All Rights Reserved - -This font family is freeware and can be used freely for personal and commercial purposes. -Although a PayPal donation in return is very much appreciated. - -You may share this font on CDs, websites,... with the following restrictions: - - - Modification of the font files is only allowed for personal use - don´t distribute a modified version of the font files! - - Do not rename the font files! - - Do not sell the font files! - - Do not pass the font files without this textfile! - - Make sure you have downloaded the latest update from www.dafont.com for best optical results. - -If you have further questions - please contact me. - -berndmontag@gmx.de \ No newline at end of file diff --git a/pyload/web/app/fonts/Sansation_Bold-webfont.eot b/pyload/web/app/fonts/Sansation_Bold-webfont.eot deleted file mode 100644 index 43ed2ee31..000000000 Binary files a/pyload/web/app/fonts/Sansation_Bold-webfont.eot and /dev/null differ diff --git a/pyload/web/app/fonts/Sansation_Bold-webfont.ttf b/pyload/web/app/fonts/Sansation_Bold-webfont.ttf deleted file mode 100644 index d2e7c4c2a..000000000 Binary files a/pyload/web/app/fonts/Sansation_Bold-webfont.ttf and /dev/null differ diff --git a/pyload/web/app/fonts/Sansation_Bold-webfont.woff b/pyload/web/app/fonts/Sansation_Bold-webfont.woff deleted file mode 100644 index 9ee938d55..000000000 Binary files a/pyload/web/app/fonts/Sansation_Bold-webfont.woff and /dev/null differ diff --git a/pyload/web/app/fonts/Sansation_Light-webfont.eot b/pyload/web/app/fonts/Sansation_Light-webfont.eot deleted file mode 100644 index d83fa9cf6..000000000 Binary files a/pyload/web/app/fonts/Sansation_Light-webfont.eot and /dev/null differ diff --git a/pyload/web/app/fonts/Sansation_Light-webfont.ttf b/pyload/web/app/fonts/Sansation_Light-webfont.ttf deleted file mode 100644 index 64d734bec..000000000 Binary files a/pyload/web/app/fonts/Sansation_Light-webfont.ttf and /dev/null differ diff --git a/pyload/web/app/fonts/Sansation_Light-webfont.woff b/pyload/web/app/fonts/Sansation_Light-webfont.woff deleted file mode 100644 index 5f3dce493..000000000 Binary files a/pyload/web/app/fonts/Sansation_Light-webfont.woff and /dev/null differ diff --git a/pyload/web/app/fonts/Sansation_Regular-webfont.eot b/pyload/web/app/fonts/Sansation_Regular-webfont.eot deleted file mode 100644 index 46219c9ff..000000000 Binary files a/pyload/web/app/fonts/Sansation_Regular-webfont.eot and /dev/null differ diff --git a/pyload/web/app/fonts/Sansation_Regular-webfont.ttf b/pyload/web/app/fonts/Sansation_Regular-webfont.ttf deleted file mode 100644 index 92f686359..000000000 Binary files a/pyload/web/app/fonts/Sansation_Regular-webfont.ttf and /dev/null differ diff --git a/pyload/web/app/fonts/Sansation_Regular-webfont.woff b/pyload/web/app/fonts/Sansation_Regular-webfont.woff deleted file mode 100644 index 524b67992..000000000 Binary files a/pyload/web/app/fonts/Sansation_Regular-webfont.woff and /dev/null differ diff --git a/pyload/web/app/images/default/bgpattern.png b/pyload/web/app/images/default/bgpattern.png deleted file mode 100644 index 5111e6bdf..000000000 Binary files a/pyload/web/app/images/default/bgpattern.png and /dev/null differ diff --git a/pyload/web/app/images/default/fancy_deboss.png b/pyload/web/app/images/default/fancy_deboss.png deleted file mode 100644 index 926a762db..000000000 Binary files a/pyload/web/app/images/default/fancy_deboss.png and /dev/null differ diff --git a/pyload/web/app/images/default/logo.png b/pyload/web/app/images/default/logo.png deleted file mode 100644 index bb9c13679..000000000 Binary files a/pyload/web/app/images/default/logo.png and /dev/null differ diff --git a/pyload/web/app/images/default/logo_grey.png b/pyload/web/app/images/default/logo_grey.png deleted file mode 100644 index a4114d832..000000000 Binary files a/pyload/web/app/images/default/logo_grey.png and /dev/null differ diff --git a/pyload/web/app/index.html b/pyload/web/app/index.html index 42dd005e4..28584587c 100644 --- a/pyload/web/app/index.html +++ b/pyload/web/app/index.html @@ -8,7 +8,6 @@ - diff --git a/pyload/web/app/scripts/config.js b/pyload/web/app/scripts/config.js index baa8f7712..f2af39c56 100644 --- a/pyload/web/app/scripts/config.js +++ b/pyload/web/app/scripts/config.js @@ -13,7 +13,7 @@ require.config({ cookie: '../components/jquery.cookie/jquery.cookie', omniwindow: 'vendor/jquery.omniwindow', select2: '../components/select2/select2', - bootstrap: 'vendor/bootstrap-2.3.2', + bootstrap: '../components/bootstrap-assets/js/bootstrap', underscore: '../components/underscore/underscore', backbone: '../components/backbone/backbone', marionette: '../components/backbone.marionette/lib/backbone.marionette', diff --git a/pyload/web/app/scripts/vendor/bootstrap-2.3.2.js b/pyload/web/app/scripts/vendor/bootstrap-2.3.2.js deleted file mode 100755 index 96fed1387..000000000 --- a/pyload/web/app/scripts/vendor/bootstrap-2.3.2.js +++ /dev/null @@ -1,2291 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ - - $(function () { - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd otransitionend' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery); -/* ========================================================= - * bootstrap-modal.js v2.3.2 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function (element, options) { - this.options = options - this.$element = $(element) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - this.options.remote && this.$element.find('.modal-body').load(this.options.remote) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - , e = $.Event('show') - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - this.isShown = true - - this.escape() - - this.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } - - that.$element.show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element - .addClass('in') - .attr('aria-hidden', false) - - that.enforceFocus() - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) : - that.$element.focus().trigger('shown') - - }) - } - - , hide: function (e) { - e && e.preventDefault() - - var that = this - - e = $.Event('hide') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - this.escape() - - $(document).off('focusin.modal') - - this.$element - .removeClass('in') - .attr('aria-hidden', true) - - $.support.transition && this.$element.hasClass('fade') ? - this.hideWithTransition() : - this.hideModal() - } - - , enforceFocus: function () { - var that = this - $(document).on('focusin.modal', function (e) { - if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { - that.$element.focus() - } - }) - } - - , escape: function () { - var that = this - if (this.isShown && this.options.keyboard) { - this.$element.on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - this.$element.off('keyup.dismiss.modal') - } - } - - , hideWithTransition: function () { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - that.hideModal() - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - that.hideModal() - }) - } - - , hideModal: function () { - var that = this - this.$element.hide() - this.backdrop(function () { - that.removeBackdrop() - that.$element.trigger('hidden') - }) - } - - , removeBackdrop: function () { - this.$backdrop && this.$backdrop.remove() - this.$backdrop = null - } - - , backdrop: function (callback) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('