From c93d50c6164c31dcfa90426fec4bd77e820e61f7 Mon Sep 17 00:00:00 2001 From: Schrolli Date: Tue, 14 Jul 2015 07:13:41 +0200 Subject: [PATCH 1/8] move the old webend data in separate folder --- www/{ => old_webend}/config.php | 0 www/{ => old_webend}/gfx/logo.png | Bin www/{ => old_webend}/index.php | 0 www/{ => old_webend}/mysql.class.php | 0 www/{ => old_webend}/parser.php | 0 www/{ => old_webend}/tpl/content.overview.php | 0 www/{ => old_webend}/tpl/content.parser.php | 0 www/{ => old_webend}/tpl/template.overview.php | 0 www/{ => old_webend}/tpl/template.parser.php | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename www/{ => old_webend}/config.php (100%) rename www/{ => old_webend}/gfx/logo.png (100%) rename www/{ => old_webend}/index.php (100%) rename www/{ => old_webend}/mysql.class.php (100%) rename www/{ => old_webend}/parser.php (100%) rename www/{ => old_webend}/tpl/content.overview.php (100%) rename www/{ => old_webend}/tpl/content.parser.php (100%) rename www/{ => old_webend}/tpl/template.overview.php (100%) rename www/{ => old_webend}/tpl/template.parser.php (100%) diff --git a/www/config.php b/www/old_webend/config.php similarity index 100% rename from www/config.php rename to www/old_webend/config.php diff --git a/www/gfx/logo.png b/www/old_webend/gfx/logo.png similarity index 100% rename from www/gfx/logo.png rename to www/old_webend/gfx/logo.png diff --git a/www/index.php b/www/old_webend/index.php similarity index 100% rename from www/index.php rename to www/old_webend/index.php diff --git a/www/mysql.class.php b/www/old_webend/mysql.class.php similarity index 100% rename from www/mysql.class.php rename to www/old_webend/mysql.class.php diff --git a/www/parser.php b/www/old_webend/parser.php similarity index 100% rename from www/parser.php rename to www/old_webend/parser.php diff --git a/www/tpl/content.overview.php b/www/old_webend/tpl/content.overview.php similarity index 100% rename from www/tpl/content.overview.php rename to www/old_webend/tpl/content.overview.php diff --git a/www/tpl/content.parser.php b/www/old_webend/tpl/content.parser.php similarity index 100% rename from www/tpl/content.parser.php rename to www/old_webend/tpl/content.parser.php diff --git a/www/tpl/template.overview.php b/www/old_webend/tpl/template.overview.php similarity index 100% rename from www/tpl/template.overview.php rename to www/old_webend/tpl/template.overview.php diff --git a/www/tpl/template.parser.php b/www/old_webend/tpl/template.parser.php similarity index 100% rename from www/tpl/template.parser.php rename to www/old_webend/tpl/template.parser.php From a3667f5a4c7a272ad326dab5a50b6be2a6438f37 Mon Sep 17 00:00:00 2001 From: Schrolli Date: Tue, 14 Jul 2015 07:14:38 +0200 Subject: [PATCH 2/8] Revert "move the old webend data in separate folder" This reverts commit c93d50c6164c31dcfa90426fec4bd77e820e61f7. --- www/{old_webend => }/config.php | 0 www/{old_webend => }/gfx/logo.png | Bin www/{old_webend => }/index.php | 0 www/{old_webend => }/mysql.class.php | 0 www/{old_webend => }/parser.php | 0 www/{old_webend => }/tpl/content.overview.php | 0 www/{old_webend => }/tpl/content.parser.php | 0 www/{old_webend => }/tpl/template.overview.php | 0 www/{old_webend => }/tpl/template.parser.php | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename www/{old_webend => }/config.php (100%) rename www/{old_webend => }/gfx/logo.png (100%) rename www/{old_webend => }/index.php (100%) rename www/{old_webend => }/mysql.class.php (100%) rename www/{old_webend => }/parser.php (100%) rename www/{old_webend => }/tpl/content.overview.php (100%) rename www/{old_webend => }/tpl/content.parser.php (100%) rename www/{old_webend => }/tpl/template.overview.php (100%) rename www/{old_webend => }/tpl/template.parser.php (100%) diff --git a/www/old_webend/config.php b/www/config.php similarity index 100% rename from www/old_webend/config.php rename to www/config.php diff --git a/www/old_webend/gfx/logo.png b/www/gfx/logo.png similarity index 100% rename from www/old_webend/gfx/logo.png rename to www/gfx/logo.png diff --git a/www/old_webend/index.php b/www/index.php similarity index 100% rename from www/old_webend/index.php rename to www/index.php diff --git a/www/old_webend/mysql.class.php b/www/mysql.class.php similarity index 100% rename from www/old_webend/mysql.class.php rename to www/mysql.class.php diff --git a/www/old_webend/parser.php b/www/parser.php similarity index 100% rename from www/old_webend/parser.php rename to www/parser.php diff --git a/www/old_webend/tpl/content.overview.php b/www/tpl/content.overview.php similarity index 100% rename from www/old_webend/tpl/content.overview.php rename to www/tpl/content.overview.php diff --git a/www/old_webend/tpl/content.parser.php b/www/tpl/content.parser.php similarity index 100% rename from www/old_webend/tpl/content.parser.php rename to www/tpl/content.parser.php diff --git a/www/old_webend/tpl/template.overview.php b/www/tpl/template.overview.php similarity index 100% rename from www/old_webend/tpl/template.overview.php rename to www/tpl/template.overview.php diff --git a/www/old_webend/tpl/template.parser.php b/www/tpl/template.parser.php similarity index 100% rename from www/old_webend/tpl/template.parser.php rename to www/tpl/template.parser.php From bfd4e2c1a4ed171ec93fff1676bb8875a4ce786a Mon Sep 17 00:00:00 2001 From: Schrolli Date: Tue, 14 Jul 2015 07:16:56 +0200 Subject: [PATCH 3/8] move old and new webend in separate folders #62 --- www/{ => new_webend}/Alarm.php | 0 www/{ => new_webend}/LICENSE.txt | 126 +- www/{ => new_webend}/config.php | 0 www/{ => new_webend}/css/font-awesome.min.css | 0 www/{ => new_webend}/css/ie/PIE.htc | 0 .../css/ie/backgroundsize.min.htc | 12 +- www/{ => new_webend}/css/ie/html5shiv.js | 0 www/{ => new_webend}/css/ie/v8.css | 148 +- www/{ => new_webend}/css/images/overlay.png | Bin www/{ => new_webend}/css/images/shadow.png | Bin www/{ => new_webend}/css/skel.css | 0 www/{ => new_webend}/css/style-1000px.css | 206 +- www/{ => new_webend}/css/style-desktop.css | 1146 +++++------ www/{ => new_webend}/css/style-mobile.css | 832 ++++---- www/{ => new_webend}/css/style.css | 1738 ++++++++--------- www/{ => new_webend}/css/usermod.css | 0 www/{ => new_webend}/eintragen.html | 0 www/{ => new_webend}/eintragen.php | 0 www/{ => new_webend}/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin www/{ => new_webend}/gfx/logo.png | Bin www/{ => new_webend}/images/banner.jpg | Bin www/{ => new_webend}/images/pic01.jpg | Bin www/{ => new_webend}/images/pic02.jpg | Bin www/{ => new_webend}/images/pic03.jpg | Bin www/{ => new_webend}/images/pic04.jpg | Bin www/{ => new_webend}/images/pic05.jpg | Bin www/{ => new_webend}/images/pic06.jpg | Bin www/{ => new_webend}/images/pic07.jpg | Bin www/{ => new_webend}/images/pic08.jpg | Bin www/{ => new_webend}/images/pic09.jpg | Bin www/{ => new_webend}/images/pic10.jpg | Bin www/{ => new_webend}/index.php | 204 +- www/{ => new_webend}/js/init.js | 170 +- .../js/jquery.dropotron.min.js | 2 +- www/{ => new_webend}/js/jquery.min.js | 0 www/{ => new_webend}/js/skel-layers.min.js | 2 +- www/{ => new_webend}/js/skel.min.js | 0 www/{ => new_webend}/login.php | 0 www/{ => new_webend}/prefs.php | 0 www/{ => new_webend}/show_fms.php | 0 www/{ => new_webend}/show_pocsag.php | 0 www/{ => new_webend}/show_zvei.php | 0 www/{ => new_webend}/tpl/a_footer.php | 0 www/{ => new_webend}/tpl/a_header.php | 0 www/{ => new_webend}/tpl/content.overview.php | 0 www/{ => new_webend}/tpl/content.parser.php | 0 www/{ => new_webend}/tpl/fms.php | 0 www/{ => new_webend}/tpl/mysql.class.php | 0 www/{ => new_webend}/tpl/parser.php | 0 www/{ => new_webend}/tpl/pocsag.php | 0 .../tpl/template.overview.php | 0 www/{ => new_webend}/tpl/template.parser.php | 0 www/{ => new_webend}/tpl/zvei.php | 0 .../tpl_old/content.overview.php | 0 .../tpl_old/content.parser.php | 0 .../tpl_old/template.overview.php | 0 .../tpl_old/template.overview.php+ | 0 .../tpl_old/template.overview.php.temp | 0 .../tpl_old/template.parser.php | 0 www/old_webend/config.php | 12 + www/old_webend/gfx/logo.png | Bin 0 -> 53434 bytes www/old_webend/index.php | 46 + www/old_webend/mysql.class.php | 134 ++ www/old_webend/parser.php | 111 ++ www/old_webend/tpl/content.overview.php | 27 + www/old_webend/tpl/content.parser.php | 3 + www/old_webend/tpl/template.overview.php | 84 + www/old_webend/tpl/template.parser.php | 0 72 files changed, 2710 insertions(+), 2293 deletions(-) rename www/{ => new_webend}/Alarm.php (100%) rename www/{ => new_webend}/LICENSE.txt (99%) rename www/{ => new_webend}/config.php (100%) rename www/{ => new_webend}/css/font-awesome.min.css (100%) rename www/{ => new_webend}/css/ie/PIE.htc (100%) rename www/{ => new_webend}/css/ie/backgroundsize.min.htc (99%) rename www/{ => new_webend}/css/ie/html5shiv.js (100%) rename www/{ => new_webend}/css/ie/v8.css (95%) rename www/{ => new_webend}/css/images/overlay.png (100%) rename www/{ => new_webend}/css/images/shadow.png (100%) rename www/{ => new_webend}/css/skel.css (100%) rename www/{ => new_webend}/css/style-1000px.css (95%) rename www/{ => new_webend}/css/style-desktop.css (94%) rename www/{ => new_webend}/css/style-mobile.css (95%) rename www/{ => new_webend}/css/style.css (94%) rename www/{ => new_webend}/css/usermod.css (100%) rename www/{ => new_webend}/eintragen.html (100%) rename www/{ => new_webend}/eintragen.php (100%) rename www/{ => new_webend}/fonts/FontAwesome.otf (100%) rename www/{ => new_webend}/fonts/fontawesome-webfont.eot (100%) rename www/{ => new_webend}/fonts/fontawesome-webfont.svg (100%) rename www/{ => new_webend}/fonts/fontawesome-webfont.ttf (100%) rename www/{ => new_webend}/fonts/fontawesome-webfont.woff (100%) rename www/{ => new_webend}/gfx/logo.png (100%) rename www/{ => new_webend}/images/banner.jpg (100%) rename www/{ => new_webend}/images/pic01.jpg (100%) rename www/{ => new_webend}/images/pic02.jpg (100%) rename www/{ => new_webend}/images/pic03.jpg (100%) rename www/{ => new_webend}/images/pic04.jpg (100%) rename www/{ => new_webend}/images/pic05.jpg (100%) rename www/{ => new_webend}/images/pic06.jpg (100%) rename www/{ => new_webend}/images/pic07.jpg (100%) rename www/{ => new_webend}/images/pic08.jpg (100%) rename www/{ => new_webend}/images/pic09.jpg (100%) rename www/{ => new_webend}/images/pic10.jpg (100%) rename www/{ => new_webend}/index.php (96%) rename www/{ => new_webend}/js/init.js (98%) rename www/{ => new_webend}/js/jquery.dropotron.min.js (99%) rename www/{ => new_webend}/js/jquery.min.js (100%) rename www/{ => new_webend}/js/skel-layers.min.js (99%) rename www/{ => new_webend}/js/skel.min.js (100%) rename www/{ => new_webend}/login.php (100%) rename www/{ => new_webend}/prefs.php (100%) rename www/{ => new_webend}/show_fms.php (100%) rename www/{ => new_webend}/show_pocsag.php (100%) rename www/{ => new_webend}/show_zvei.php (100%) rename www/{ => new_webend}/tpl/a_footer.php (100%) rename www/{ => new_webend}/tpl/a_header.php (100%) rename www/{ => new_webend}/tpl/content.overview.php (100%) rename www/{ => new_webend}/tpl/content.parser.php (100%) rename www/{ => new_webend}/tpl/fms.php (100%) rename www/{ => new_webend}/tpl/mysql.class.php (100%) rename www/{ => new_webend}/tpl/parser.php (100%) rename www/{ => new_webend}/tpl/pocsag.php (100%) rename www/{ => new_webend}/tpl/template.overview.php (100%) rename www/{ => new_webend}/tpl/template.parser.php (100%) rename www/{ => new_webend}/tpl/zvei.php (100%) rename www/{ => new_webend}/tpl_old/content.overview.php (100%) rename www/{ => new_webend}/tpl_old/content.parser.php (100%) rename www/{ => new_webend}/tpl_old/template.overview.php (100%) rename www/{ => new_webend}/tpl_old/template.overview.php+ (100%) rename www/{ => new_webend}/tpl_old/template.overview.php.temp (100%) rename www/{ => new_webend}/tpl_old/template.parser.php (100%) create mode 100644 www/old_webend/config.php create mode 100644 www/old_webend/gfx/logo.png create mode 100644 www/old_webend/index.php create mode 100644 www/old_webend/mysql.class.php create mode 100644 www/old_webend/parser.php create mode 100644 www/old_webend/tpl/content.overview.php create mode 100644 www/old_webend/tpl/content.parser.php create mode 100644 www/old_webend/tpl/template.overview.php create mode 100644 www/old_webend/tpl/template.parser.php diff --git a/www/Alarm.php b/www/new_webend/Alarm.php similarity index 100% rename from www/Alarm.php rename to www/new_webend/Alarm.php diff --git a/www/LICENSE.txt b/www/new_webend/LICENSE.txt similarity index 99% rename from www/LICENSE.txt rename to www/new_webend/LICENSE.txt index d447b56..856b578 100644 --- a/www/LICENSE.txt +++ b/www/new_webend/LICENSE.txt @@ -1,63 +1,63 @@ -Creative Commons Attribution 3.0 Unported -http://creativecommons.org/licenses/by/3.0/ - -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - -1. Definitions - - 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. - 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. - 3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. - 4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. - 5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. - 6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. - 7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. - 8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. - 9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. - -2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. - -3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: - - 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; - 2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; - 3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, - 4. to Distribute and Publicly Perform Adaptations. - 5. - - For the avoidance of doubt: - 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; - 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, - 3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. - -The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. - -4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: - - 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested. - 2. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. - 3. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. - 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. - -8. Miscellaneous - - 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. - 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. - 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. - 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. - 6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. +Creative Commons Attribution 3.0 Unported +http://creativecommons.org/licenses/by/3.0/ + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. + 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. + 3. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. + 4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. + 5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. + 6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. + 7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + 8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. + 9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; + 2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; + 3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, + 4. to Distribute and Publicly Perform Adaptations. + 5. + + For the avoidance of doubt: + 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; + 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, + 3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(b), as requested. + 2. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4 (b) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. + 3. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + 6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff --git a/www/config.php b/www/new_webend/config.php similarity index 100% rename from www/config.php rename to www/new_webend/config.php diff --git a/www/css/font-awesome.min.css b/www/new_webend/css/font-awesome.min.css similarity index 100% rename from www/css/font-awesome.min.css rename to www/new_webend/css/font-awesome.min.css diff --git a/www/css/ie/PIE.htc b/www/new_webend/css/ie/PIE.htc similarity index 100% rename from www/css/ie/PIE.htc rename to www/new_webend/css/ie/PIE.htc diff --git a/www/css/ie/backgroundsize.min.htc b/www/new_webend/css/ie/backgroundsize.min.htc similarity index 99% rename from www/css/ie/backgroundsize.min.htc rename to www/new_webend/css/ie/backgroundsize.min.htc index 3d9960d..9b2592e 100644 --- a/www/css/ie/backgroundsize.min.htc +++ b/www/new_webend/css/ie/backgroundsize.min.htc @@ -1,7 +1,7 @@ - - - - - \ No newline at end of file diff --git a/www/css/ie/html5shiv.js b/www/new_webend/css/ie/html5shiv.js similarity index 100% rename from www/css/ie/html5shiv.js rename to www/new_webend/css/ie/html5shiv.js diff --git a/www/css/ie/v8.css b/www/new_webend/css/ie/v8.css similarity index 95% rename from www/css/ie/v8.css rename to www/new_webend/css/ie/v8.css index e9c22aa..a0f4be3 100644 --- a/www/css/ie/v8.css +++ b/www/new_webend/css/ie/v8.css @@ -1,74 +1,74 @@ -/* - Escape Velocity by HTML5 UP - html5up.net | @n33co - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) -*/ - -/*********************************************************************************/ -/* Basic */ -/*********************************************************************************/ - - form input[type="text"], - form input[type="email"], - form input[type="password"], - form select, - form textarea, - input[type="button"], - input[type="submit"], - input[type="reset"], - .button, - #intro > .style2, - #copyright ul, - #nav > ul, - .dropotron - { - position: relative; - -ms-behavior: url('css/ie/PIE.htc'); - } - - /* Section/Article */ - - section, - article - { - } - - section > .last-child, - article > .last-child - { - margin-bottom: 0; - } - - section.last-child, - article.last-child - { - margin-bottom: 0; - } - -/*********************************************************************************/ -/* Wrappers */ -/*********************************************************************************/ - - .wrapper - { - } - - .wrapper .title:before, - .wrapper .title:after - { - display: none; - } - - #header-wrapper - { - -ms-behavior: url('css/ie/backgroundsize.min.htc'); - } - -/*********************************************************************************/ -/* Copyright */ -/*********************************************************************************/ - - #copyright - { - margin: 0; - } +/* + Escape Velocity by HTML5 UP + html5up.net | @n33co + Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) +*/ + +/*********************************************************************************/ +/* Basic */ +/*********************************************************************************/ + + form input[type="text"], + form input[type="email"], + form input[type="password"], + form select, + form textarea, + input[type="button"], + input[type="submit"], + input[type="reset"], + .button, + #intro > .style2, + #copyright ul, + #nav > ul, + .dropotron + { + position: relative; + -ms-behavior: url('css/ie/PIE.htc'); + } + + /* Section/Article */ + + section, + article + { + } + + section > .last-child, + article > .last-child + { + margin-bottom: 0; + } + + section.last-child, + article.last-child + { + margin-bottom: 0; + } + +/*********************************************************************************/ +/* Wrappers */ +/*********************************************************************************/ + + .wrapper + { + } + + .wrapper .title:before, + .wrapper .title:after + { + display: none; + } + + #header-wrapper + { + -ms-behavior: url('css/ie/backgroundsize.min.htc'); + } + +/*********************************************************************************/ +/* Copyright */ +/*********************************************************************************/ + + #copyright + { + margin: 0; + } diff --git a/www/css/images/overlay.png b/www/new_webend/css/images/overlay.png similarity index 100% rename from www/css/images/overlay.png rename to www/new_webend/css/images/overlay.png diff --git a/www/css/images/shadow.png b/www/new_webend/css/images/shadow.png similarity index 100% rename from www/css/images/shadow.png rename to www/new_webend/css/images/shadow.png diff --git a/www/css/skel.css b/www/new_webend/css/skel.css similarity index 100% rename from www/css/skel.css rename to www/new_webend/css/skel.css diff --git a/www/css/style-1000px.css b/www/new_webend/css/style-1000px.css similarity index 95% rename from www/css/style-1000px.css rename to www/new_webend/css/style-1000px.css index ccb69d5..337c7c7 100644 --- a/www/css/style-1000px.css +++ b/www/new_webend/css/style-1000px.css @@ -1,104 +1,104 @@ -/* - Escape Velocity by HTML5 UP - html5up.net | @n33co - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) -*/ - -/*********************************************************************************/ -/* Basic */ -/*********************************************************************************/ - - body - { - min-width: 1000px; - } - - body, input, select, textarea - { - font-size: 12pt; - line-height: 1.5em; - letter-spacing: 0.015em; - } - - body - { - min-width: 960px; - } - -/*********************************************************************************/ -/* Wrappers */ -/*********************************************************************************/ - - .wrapper - { - padding: 4em 0 7em 0; - } - - #intro-wrapper - { - padding-bottom: 7em; - } - - #footer-wrapper - { - } - - #footer-wrapper hr - { - margin: 3em 0 3em 0; - } - -/*********************************************************************************/ -/* Header */ -/*********************************************************************************/ - - #header - { - padding: 10em 0; - } - - .homepage #header - { - padding: 14em 0; - } - -/*********************************************************************************/ -/* Logo */ -/*********************************************************************************/ - - #logo - { - margin-top: -0.5em !important; - } - - #logo h1 - { - font-size: 1.75em; - } - -/*********************************************************************************/ -/* Intro */ -/*********************************************************************************/ - - #intro - { - } - - #intro > .style1 - { - font-size: 1.25em; - } - - #intro > .style2 - { - font-size: 2.25em; - } - -/*********************************************************************************/ -/* Copyright */ -/*********************************************************************************/ - - #copyright - { - margin: 3em 0 0 0; +/* + Escape Velocity by HTML5 UP + html5up.net | @n33co + Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) +*/ + +/*********************************************************************************/ +/* Basic */ +/*********************************************************************************/ + + body + { + min-width: 1000px; + } + + body, input, select, textarea + { + font-size: 12pt; + line-height: 1.5em; + letter-spacing: 0.015em; + } + + body + { + min-width: 960px; + } + +/*********************************************************************************/ +/* Wrappers */ +/*********************************************************************************/ + + .wrapper + { + padding: 4em 0 7em 0; + } + + #intro-wrapper + { + padding-bottom: 7em; + } + + #footer-wrapper + { + } + + #footer-wrapper hr + { + margin: 3em 0 3em 0; + } + +/*********************************************************************************/ +/* Header */ +/*********************************************************************************/ + + #header + { + padding: 10em 0; + } + + .homepage #header + { + padding: 14em 0; + } + +/*********************************************************************************/ +/* Logo */ +/*********************************************************************************/ + + #logo + { + margin-top: -0.5em !important; + } + + #logo h1 + { + font-size: 1.75em; + } + +/*********************************************************************************/ +/* Intro */ +/*********************************************************************************/ + + #intro + { + } + + #intro > .style1 + { + font-size: 1.25em; + } + + #intro > .style2 + { + font-size: 2.25em; + } + +/*********************************************************************************/ +/* Copyright */ +/*********************************************************************************/ + + #copyright + { + margin: 3em 0 0 0; } \ No newline at end of file diff --git a/www/css/style-desktop.css b/www/new_webend/css/style-desktop.css similarity index 94% rename from www/css/style-desktop.css rename to www/new_webend/css/style-desktop.css index 8f0d21f..35c5079 100644 --- a/www/css/style-desktop.css +++ b/www/new_webend/css/style-desktop.css @@ -1,574 +1,574 @@ -/* - Escape Velocity by HTML5 UP - html5up.net | @n33co - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) -*/ - -/*********************************************************************************/ -/* Basic */ -/*********************************************************************************/ - - body, input, select, textarea - { - font-size: 13pt; - line-height: 1.75em; - letter-spacing: 0.025em; - } - - body - { - min-width: 1200px; - } - - hr - { - margin: 2em 0 2em 0; - } - - /* Section/Article */ - - section, - article - { - margin: 0 0 4em 0; - } - - header.style1 - { - padding: 3em 0 3em 0; - } - - header.style1 h2 - { - font-size: 2em; - letter-spacing: 0.075em; - line-height: 1.5em; - } - - header.style1 p - { - display: block; - margin: 1.15em 0 0 0; - font-size: 1.3em; - letter-spacing: 0.075em; - line-height: 1.5em; - } - - /* Form */ - - form - { - } - - form label - { - margin: 0.25em 0 0.5em 0; - } - - /* Button */ - - input[type="button"], - input[type="submit"], - input[type="reset"], - .button - { - padding: 0 2.25em 0 2.25em; - font-size: 0.9em; - min-width: 12em; - height: 4em; - line-height: 4em; - } - - input[type="button"].big, - input[type="submit"].big, - input[type="reset"].big, - .button.big - { - font-size: 1em; - min-width: 14em; - } - - /* List */ - - ul - { - } - - ul.actions - { - margin: 3em 0 0 0; - } - - form ul.actions - { - margin-top: 0; - } - - ul.actions li - { - display: inline-block; - margin: 0 0.75em 0 0.75em; - } - - ul.actions li:first-child - { - margin-left: 0; - } - - ul.actions li:last-child - { - margin-right: 0; - } - - ul.actions-centered - { - text-align: center; - } - - /* Feature List */ - - .feature-list - { - } - - .feature-list section - { - padding-top: 2em; - border-top: solid 1px #eee; - } - - .feature-list .row - { - } - - .feature-list .row:first-child - { - } - - .feature-list .row:first-child section - { - padding-top: 0; - border-top: 0; - } - - .feature-list h3 - { - margin: 0 0 0.75em 0; - font-size: 1.15em; - letter-spacing: 0.05em; - margin-top: -0.35em; - } - - .feature-list h3:before - { - width: 64px; - height: 64px; - line-height: 64px; - margin-right: 0.75em; - font-size: 32px; - top: 0.2em; - } - - .feature-list p - { - margin: 0 0 0 5em; - } - - .feature-list.small - { - } - - .feature-list.small h3 - { - } - - .feature-list.small h3:before - { - font-size: 24px; - line-height: 45px; - width: 45px; - height: 45px; - margin-right: 1em; - } - - .feature-list.small p - { - margin: 0 0 0 4em; - } - - /* Box */ - - .box - { - } - - .box header - { - margin: 0 0 1.5em 0; - } - - .box header.style1 - { - position: relative; - margin: -0.5em 0 0 0; - padding-top: 0; - } - - .box h2 - { - margin: 0 0 0.75em 0; - font-size: 1.15em; - letter-spacing: 0.05em; - } - - .box h3 - { - margin: 0 0 0.5em 0; - font-size: 1em; - font-weight: 600; - letter-spacing: 0.05em; - } - - .box.post-excerpt - { - } - - .box.post-excerpt .image.left - { - position: relative; - top: 0.5em; - width: 5em; - } - - .box.-post-excerpt h3, - .box.post-excerpt p - { - margin-left: 7em; - } - -/*********************************************************************************/ -/* Wrappers */ -/*********************************************************************************/ - - .wrapper - { - padding: 6em 0 9em 0; - } - - .wrapper .title - { - font-size: 0.9em; - width: 25em; - height: 3.25em; - top: -3.25em; - line-height: 3.25em; - margin-bottom: -3.25em; - margin-left: -12.5em; - padding-top: 0.5em; - } - - #header-wrapper - { - padding: 0; - } - - #intro-wrapper - { - padding-bottom: 8em; - } - -/*********************************************************************************/ -/* Header */ -/*********************************************************************************/ - - #header - { - position: relative; - padding: 5.5em 0; - } - - .homepage #header - { - padding: 18em 0; - } - -/*********************************************************************************/ -/* Logo */ -/*********************************************************************************/ - - #logo - { - position: absolute; - height: 5em; - top: 50%; - left: 0; - width: 100%; - text-align: center; - margin-top: -0.5em; - } - - .homepage #logo - { - margin-top: -1em; - } - - #logo h1 - { - font-size: 2em; - letter-spacing: 0.25em; - } - - #logo p - { - margin: 1.25em 0 0 0; - display: block; - letter-spacing: 0.2em; - font-size: 0.9em; - } - -/*********************************************************************************/ -/* Nav */ -/*********************************************************************************/ - - #nav - { - position: absolute; - display: block; - top: 2.5em; - left: 0; - width: 100%; - text-align: center; - } - - #nav > ul > li > ul - { - display: none; - } - - #nav > ul - { - display: inline-block; - border-radius: 0.35em; - box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.25); - padding: 0 1.5em 0 1.5em; - } - - #nav > ul > li - { - display: inline-block; - text-align: center; - padding: 0 1.5em 0 1.5em; - } - - #nav > ul > li > a, - #nav > ul > li > span - { - display: block; - color: #eee; - color: rgba(255,255,255,0.75); - text-transform: uppercase; - text-decoration: none; - font-size: 0.7em; - letter-spacing: 0.25em; - height: 5em; - line-height: 5em; - -moz-transition: all .25s ease-in-out; - -webkit-transition: all .25s ease-in-out; - -o-transition: all .25s ease-in-out; - -ms-transition: all .25s ease-in-out; - transition: all .25s ease-in-out; - outline: 0; - } - - #nav > ul > li:hover > a, - #nav > ul > li.active > a, - #nav > ul > li.active > span - { - color: #fff; - } - - .dropotron - { - background: #222835 url('images/overlay.png'); - background-color: rgba(44,50,63,0.925); - padding: 1.25em 1em 1.25em 1em; - border-radius: 0.35em; - box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.25); - min-width: 12em; - text-align: left; - margin-top: -1.25em; - margin-left: -1px; - } - - .dropotron.level-0 - { - margin-top: -1px; - margin-left: 0; - border-top-left-radius: 0; - border-top-right-radius: 0; - } - - .dropotron a, - .dropotron span - { - display: block; - color: #eee; - color: rgba(255,255,255,0.75); - text-transform: uppercase; - text-decoration: none; - font-size: 0.7em; - letter-spacing: 0.25em; - border-top: solid 1px rgba(255,255,255,0.15); - line-height: 3em; - -moz-transition: all .25s ease-in-out; - -webkit-transition: all .25s ease-in-out; - -o-transition: all .25s ease-in-out; - -ms-transition: all .25s ease-in-out; - transition: all .25s ease-in-out; - } - - .dropotron li:first-child a, - .dropotron li:first-child span - { - border-top: 0; - } - - .dropotron li:hover > a, - .dropotron li:hover > span - { - color: #fff; - } - -/*********************************************************************************/ -/* Intro */ -/*********************************************************************************/ - - #intro - { - text-align: center; - } - - #intro > .style1 - { - font-size: 1.5em; - letter-spacing: 0.075em; - } - - #intro > .style2 - { - font-size: 2.75em; - letter-spacing: 0.075em; - line-height: 1.35em; - padding: 1em 0 1em 0; - margin-bottom: 1em; - } - - #intro > .style3 - { - font-size: 1.1em; - width: 48em; - margin: 0 auto; - } - -/*********************************************************************************/ -/* Features */ -/*********************************************************************************/ - - #features - { - padding: 0 6em 0 6em; - } - - #features header.style1 - { - padding-bottom: 5em; - } - - #features .actions - { - margin-top: 5em; - } - -/*********************************************************************************/ -/* Highlights */ -/*********************************************************************************/ - - #highlights - { - } - - #highlights .highlight - { - } - - #highlights .highlight h3 - { - margin: 0 0 0.75em 0; - font-size: 1.15em; - letter-spacing: 0.05em; - } - -/*********************************************************************************/ -/* Main */ -/*********************************************************************************/ - - #main - { - margin-top: 1em; - margin-bottom: 1em; - } - - .homepage #main - { - margin-top: 0; - margin-bottom: 0; - } - -/*********************************************************************************/ -/* Footer */ -/*********************************************************************************/ - - #footer - { - } - - #footer header.style1 - { - padding-bottom: 0; - } - - #footer hr - { - margin: 6em 0 6em 0; - } - -/*********************************************************************************/ -/* Copyright */ -/*********************************************************************************/ - - #copyright - { - margin: 6em 0 0 0; - } - - #copyright ul - { - padding: 0.75em 2em; - font-size: 0.9em; - } - - #copyright ul li - { - display: inline-block; - margin-left: 1em; - padding-left: 1em; - border-left: solid 1px #333; - border-left-color: rgba(255,255,255,0.05); - } - - #copyright ul li:first-child - { - border-left: 0; - margin-left: 0; - padding-left: 0; +/* + Escape Velocity by HTML5 UP + html5up.net | @n33co + Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) +*/ + +/*********************************************************************************/ +/* Basic */ +/*********************************************************************************/ + + body, input, select, textarea + { + font-size: 13pt; + line-height: 1.75em; + letter-spacing: 0.025em; + } + + body + { + min-width: 1200px; + } + + hr + { + margin: 2em 0 2em 0; + } + + /* Section/Article */ + + section, + article + { + margin: 0 0 4em 0; + } + + header.style1 + { + padding: 3em 0 3em 0; + } + + header.style1 h2 + { + font-size: 2em; + letter-spacing: 0.075em; + line-height: 1.5em; + } + + header.style1 p + { + display: block; + margin: 1.15em 0 0 0; + font-size: 1.3em; + letter-spacing: 0.075em; + line-height: 1.5em; + } + + /* Form */ + + form + { + } + + form label + { + margin: 0.25em 0 0.5em 0; + } + + /* Button */ + + input[type="button"], + input[type="submit"], + input[type="reset"], + .button + { + padding: 0 2.25em 0 2.25em; + font-size: 0.9em; + min-width: 12em; + height: 4em; + line-height: 4em; + } + + input[type="button"].big, + input[type="submit"].big, + input[type="reset"].big, + .button.big + { + font-size: 1em; + min-width: 14em; + } + + /* List */ + + ul + { + } + + ul.actions + { + margin: 3em 0 0 0; + } + + form ul.actions + { + margin-top: 0; + } + + ul.actions li + { + display: inline-block; + margin: 0 0.75em 0 0.75em; + } + + ul.actions li:first-child + { + margin-left: 0; + } + + ul.actions li:last-child + { + margin-right: 0; + } + + ul.actions-centered + { + text-align: center; + } + + /* Feature List */ + + .feature-list + { + } + + .feature-list section + { + padding-top: 2em; + border-top: solid 1px #eee; + } + + .feature-list .row + { + } + + .feature-list .row:first-child + { + } + + .feature-list .row:first-child section + { + padding-top: 0; + border-top: 0; + } + + .feature-list h3 + { + margin: 0 0 0.75em 0; + font-size: 1.15em; + letter-spacing: 0.05em; + margin-top: -0.35em; + } + + .feature-list h3:before + { + width: 64px; + height: 64px; + line-height: 64px; + margin-right: 0.75em; + font-size: 32px; + top: 0.2em; + } + + .feature-list p + { + margin: 0 0 0 5em; + } + + .feature-list.small + { + } + + .feature-list.small h3 + { + } + + .feature-list.small h3:before + { + font-size: 24px; + line-height: 45px; + width: 45px; + height: 45px; + margin-right: 1em; + } + + .feature-list.small p + { + margin: 0 0 0 4em; + } + + /* Box */ + + .box + { + } + + .box header + { + margin: 0 0 1.5em 0; + } + + .box header.style1 + { + position: relative; + margin: -0.5em 0 0 0; + padding-top: 0; + } + + .box h2 + { + margin: 0 0 0.75em 0; + font-size: 1.15em; + letter-spacing: 0.05em; + } + + .box h3 + { + margin: 0 0 0.5em 0; + font-size: 1em; + font-weight: 600; + letter-spacing: 0.05em; + } + + .box.post-excerpt + { + } + + .box.post-excerpt .image.left + { + position: relative; + top: 0.5em; + width: 5em; + } + + .box.-post-excerpt h3, + .box.post-excerpt p + { + margin-left: 7em; + } + +/*********************************************************************************/ +/* Wrappers */ +/*********************************************************************************/ + + .wrapper + { + padding: 6em 0 9em 0; + } + + .wrapper .title + { + font-size: 0.9em; + width: 25em; + height: 3.25em; + top: -3.25em; + line-height: 3.25em; + margin-bottom: -3.25em; + margin-left: -12.5em; + padding-top: 0.5em; + } + + #header-wrapper + { + padding: 0; + } + + #intro-wrapper + { + padding-bottom: 8em; + } + +/*********************************************************************************/ +/* Header */ +/*********************************************************************************/ + + #header + { + position: relative; + padding: 5.5em 0; + } + + .homepage #header + { + padding: 18em 0; + } + +/*********************************************************************************/ +/* Logo */ +/*********************************************************************************/ + + #logo + { + position: absolute; + height: 5em; + top: 50%; + left: 0; + width: 100%; + text-align: center; + margin-top: -0.5em; + } + + .homepage #logo + { + margin-top: -1em; + } + + #logo h1 + { + font-size: 2em; + letter-spacing: 0.25em; + } + + #logo p + { + margin: 1.25em 0 0 0; + display: block; + letter-spacing: 0.2em; + font-size: 0.9em; + } + +/*********************************************************************************/ +/* Nav */ +/*********************************************************************************/ + + #nav + { + position: absolute; + display: block; + top: 2.5em; + left: 0; + width: 100%; + text-align: center; + } + + #nav > ul > li > ul + { + display: none; + } + + #nav > ul + { + display: inline-block; + border-radius: 0.35em; + box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.25); + padding: 0 1.5em 0 1.5em; + } + + #nav > ul > li + { + display: inline-block; + text-align: center; + padding: 0 1.5em 0 1.5em; + } + + #nav > ul > li > a, + #nav > ul > li > span + { + display: block; + color: #eee; + color: rgba(255,255,255,0.75); + text-transform: uppercase; + text-decoration: none; + font-size: 0.7em; + letter-spacing: 0.25em; + height: 5em; + line-height: 5em; + -moz-transition: all .25s ease-in-out; + -webkit-transition: all .25s ease-in-out; + -o-transition: all .25s ease-in-out; + -ms-transition: all .25s ease-in-out; + transition: all .25s ease-in-out; + outline: 0; + } + + #nav > ul > li:hover > a, + #nav > ul > li.active > a, + #nav > ul > li.active > span + { + color: #fff; + } + + .dropotron + { + background: #222835 url('images/overlay.png'); + background-color: rgba(44,50,63,0.925); + padding: 1.25em 1em 1.25em 1em; + border-radius: 0.35em; + box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.25); + min-width: 12em; + text-align: left; + margin-top: -1.25em; + margin-left: -1px; + } + + .dropotron.level-0 + { + margin-top: -1px; + margin-left: 0; + border-top-left-radius: 0; + border-top-right-radius: 0; + } + + .dropotron a, + .dropotron span + { + display: block; + color: #eee; + color: rgba(255,255,255,0.75); + text-transform: uppercase; + text-decoration: none; + font-size: 0.7em; + letter-spacing: 0.25em; + border-top: solid 1px rgba(255,255,255,0.15); + line-height: 3em; + -moz-transition: all .25s ease-in-out; + -webkit-transition: all .25s ease-in-out; + -o-transition: all .25s ease-in-out; + -ms-transition: all .25s ease-in-out; + transition: all .25s ease-in-out; + } + + .dropotron li:first-child a, + .dropotron li:first-child span + { + border-top: 0; + } + + .dropotron li:hover > a, + .dropotron li:hover > span + { + color: #fff; + } + +/*********************************************************************************/ +/* Intro */ +/*********************************************************************************/ + + #intro + { + text-align: center; + } + + #intro > .style1 + { + font-size: 1.5em; + letter-spacing: 0.075em; + } + + #intro > .style2 + { + font-size: 2.75em; + letter-spacing: 0.075em; + line-height: 1.35em; + padding: 1em 0 1em 0; + margin-bottom: 1em; + } + + #intro > .style3 + { + font-size: 1.1em; + width: 48em; + margin: 0 auto; + } + +/*********************************************************************************/ +/* Features */ +/*********************************************************************************/ + + #features + { + padding: 0 6em 0 6em; + } + + #features header.style1 + { + padding-bottom: 5em; + } + + #features .actions + { + margin-top: 5em; + } + +/*********************************************************************************/ +/* Highlights */ +/*********************************************************************************/ + + #highlights + { + } + + #highlights .highlight + { + } + + #highlights .highlight h3 + { + margin: 0 0 0.75em 0; + font-size: 1.15em; + letter-spacing: 0.05em; + } + +/*********************************************************************************/ +/* Main */ +/*********************************************************************************/ + + #main + { + margin-top: 1em; + margin-bottom: 1em; + } + + .homepage #main + { + margin-top: 0; + margin-bottom: 0; + } + +/*********************************************************************************/ +/* Footer */ +/*********************************************************************************/ + + #footer + { + } + + #footer header.style1 + { + padding-bottom: 0; + } + + #footer hr + { + margin: 6em 0 6em 0; + } + +/*********************************************************************************/ +/* Copyright */ +/*********************************************************************************/ + + #copyright + { + margin: 6em 0 0 0; + } + + #copyright ul + { + padding: 0.75em 2em; + font-size: 0.9em; + } + + #copyright ul li + { + display: inline-block; + margin-left: 1em; + padding-left: 1em; + border-left: solid 1px #333; + border-left-color: rgba(255,255,255,0.05); + } + + #copyright ul li:first-child + { + border-left: 0; + margin-left: 0; + padding-left: 0; } \ No newline at end of file diff --git a/www/css/style-mobile.css b/www/new_webend/css/style-mobile.css similarity index 95% rename from www/css/style-mobile.css rename to www/new_webend/css/style-mobile.css index 27f52b1..7ee86d6 100644 --- a/www/css/style-mobile.css +++ b/www/new_webend/css/style-mobile.css @@ -1,417 +1,417 @@ -/* - Escape Velocity by HTML5 UP - html5up.net | @n33co - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) -*/ - -/*********************************************************************************/ -/* Basic */ -/*********************************************************************************/ - - body, input, select, textarea - { - line-height: 1.5em; - font-size: 10.5pt; - letter-spacing: 0; - } - - h2, h3, h4, h5, h6 - { - font-size: 1.2em; - letter-spacing: 0.05em; - margin: 0 0 1em 0; - } - - hr - { - margin: 1em 0 1em 0; - } - - /* Section/Article */ - - section, - article - { - clear: both; - padding: 1em 0 1em 0 !important; - } - - header - { - } - - header br - { - display: none; - } - - header.style1 - { - padding: 0 0 1em 0; - } - - header.style1 h2 - { - font-size: 1.5em; - letter-spacing: 0.075em; - line-height: 1.25em; - } - - header.style1 p - { - display: block; - margin: 0; - } - - /* Button */ - - input[type="button"], - input[type="submit"], - input[type="reset"], - .button - { - display: block; - width: 100%; - font-size: 1em; - padding: 1em 0 1em 0; - max-width: 30em; - margin: 0 auto; - } - - /* List */ - - ul.actions - { - margin: 2em 0 0 0; - } - - form ul.actions - { - margin: 1em 0 0 0; - } - - ul.actions li - { - margin: 15px 0 0 0; - } - - /* Feature List */ - - .feature-list - { - } - - .feature-list section - { - border-top: solid 1px #eee; - } - - /* Ugh ... disgusting. */ - .feature-list > div > div:first-child > div:first-child > section - { - border-top: 0; - padding-top: 0; - } - - .feature-list h3 - { - position: relative; - padding: 4px 0 0 48px; - line-height: 1.25em; - } - - .feature-list h3:before - { - position: absolute; - left: 0; - top: 0; - width: 32px; - height: 32px; - line-height: 32px; - font-size: 16px; - } - - .feature-list p - { - margin: 0 0 0 48px; - } - - /* Box */ - - .box - { - } - - .box.post-excerpt - { - } - - .box.post-excerpt .image.left - { - position: relative; - top: 0.25em; - width: 25%; - margin: 0; - } - - .box.post-excerpt h3, - .box.post-excerpt p - { - margin-left: 32.5%; - } - -/*********************************************************************************/ -/* Mobile UI */ -/*********************************************************************************/ - - #titleBar - { - background: none; - } - - #titleBar .title - { - display: none; - } - - #titleBar .toggle - { - position: absolute; - top: 0; - left: 0; - width: 60px; - height: 44px; - } - - #titleBar .toggle:before - { - font-family: FontAwesome; - text-decoration: none; - font-style: normal; - font-weight: normal; - -webkit-font-smoothing:antialiased; - -moz-osx-font-smoothing:grayscale; - - content: '\f0c9'; - font-size: 14px; - position: absolute; - top: 6px; - left: 6px; - display: block; - width: 54px; - height: 38px; - line-height: 38px; - text-align: center; - color: rgba(255,255,255,0.75); - background-color: rgba(92,95,103,0.5); - border-radius: 0.25em; - -moz-transition: all .15s ease-in-out; - -webkit-transition: all .15s ease-in-out; - -o-transition: all .15s ease-in-out; - -ms-transition: all .15s ease-in-out; - transition: all .15s ease-in-out; - } - - #titleBar .toggle:active:before - { - background-color: rgba(92,95,103,0.75); - } - - #navPanel - { - background: #242730 url('images/overlay.png'); - box-shadow: inset -3px 0px 4px 0px rgba(0,0,0,0.1); - } - - #navPanel .link - { - display: block; - color: rgba(255,255,255,0.5); - text-transform: uppercase; - text-decoration: none; - font-size: 0.85em; - letter-spacing: 0.15em; - text-decoration: none; - height: 44px; - line-height: 44px; - border-top: solid 1px rgba(255,255,255,0.05); - margin: 0 15px 0 15px; - } - - #navPanel .link:first-child - { - border-top: 0; - } - - #navPanel .indent-1 { display: inline-block; width: 1em; } - #navPanel .indent-2 { display: inline-block; width: 2em; } - #navPanel .indent-3 { display: inline-block; width: 3em; } - #navPanel .indent-4 { display: inline-block; width: 4em; } - #navPanel .indent-5 { display: inline-block; width: 5em; } - #navPanel .depth-0 { color: #fff; } - -/*********************************************************************************/ -/* Wrappers */ -/*********************************************************************************/ - - .wrapper - { - padding: 15px 15px 5em 15px; - } - - .wrapper .title - { - font-size: 0.9em; - width: 18em; - height: 2.5em; - top: -2.5em; - line-height: 2.5em; - margin-bottom: -2.5em; - margin-left: -9em; - padding-top: 0.5em; - } - - .wrapper .title:before, - .wrapper .title:after - { - height: 15px; - bottom: -15px; - background-size: 100% 100%; - } - - #header-wrapper - { - padding: 6em 2em 6em 2em; - } - - #footer-wrapper - { - padding-top: 3em; - } - - #footer-wrapper .feature-list section - { - border-top-color: #eee; - border-top-color: rgba(255,255,255,0.05); - } - -/*********************************************************************************/ -/* Header */ -/*********************************************************************************/ - - #header - { - } - -/*********************************************************************************/ -/* Logo */ -/*********************************************************************************/ - - #logo - { - text-align: center; - } - - #logo h1 - { - font-size: 1.5em; - letter-spacing: 0.2em; - } - - #logo p - { - margin: 1.25em 0 0 0; - display: block; - letter-spacing: 0.2em; - font-size: 0.9em; - } - -/*********************************************************************************/ -/* Nav */ -/*********************************************************************************/ - - #nav - { - display: none; - } - -/*********************************************************************************/ -/* Intro */ -/*********************************************************************************/ - - #intro - { - text-align: center; - padding: 1em 2em 1em 2em !important; - margin: 0 auto; - } - - #intro .style2 - { - font-size: 1.5em; - letter-spacing: 0.05em; - line-height: 1.25em; - padding: 1.25em; - } - -/*********************************************************************************/ -/* Main */ -/*********************************************************************************/ - - #main - { - padding: 1em 0 0 0; - } - -/*********************************************************************************/ -/* Content */ -/*********************************************************************************/ - - #content - { - padding: 0 0 2em 0; - } - - #content header.style1 - { - padding-bottom: 2.5em; - } - -/*********************************************************************************/ -/* Footer */ -/*********************************************************************************/ - - #footer - { - } - - #footer hr - { - display: none; - } - -/*********************************************************************************/ -/* Copyright */ -/*********************************************************************************/ - - #copyright - { - padding: 2em 0 0 0; - } - - #copyright ul - { - padding: 1em 2em; - width: 100%; - } - - #copyright ul li - { - display: block; - margin: 0.5em 0 0 0; - } - - #copyright ul li:first-child - { - margin-top: 0; +/* + Escape Velocity by HTML5 UP + html5up.net | @n33co + Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) +*/ + +/*********************************************************************************/ +/* Basic */ +/*********************************************************************************/ + + body, input, select, textarea + { + line-height: 1.5em; + font-size: 10.5pt; + letter-spacing: 0; + } + + h2, h3, h4, h5, h6 + { + font-size: 1.2em; + letter-spacing: 0.05em; + margin: 0 0 1em 0; + } + + hr + { + margin: 1em 0 1em 0; + } + + /* Section/Article */ + + section, + article + { + clear: both; + padding: 1em 0 1em 0 !important; + } + + header + { + } + + header br + { + display: none; + } + + header.style1 + { + padding: 0 0 1em 0; + } + + header.style1 h2 + { + font-size: 1.5em; + letter-spacing: 0.075em; + line-height: 1.25em; + } + + header.style1 p + { + display: block; + margin: 0; + } + + /* Button */ + + input[type="button"], + input[type="submit"], + input[type="reset"], + .button + { + display: block; + width: 100%; + font-size: 1em; + padding: 1em 0 1em 0; + max-width: 30em; + margin: 0 auto; + } + + /* List */ + + ul.actions + { + margin: 2em 0 0 0; + } + + form ul.actions + { + margin: 1em 0 0 0; + } + + ul.actions li + { + margin: 15px 0 0 0; + } + + /* Feature List */ + + .feature-list + { + } + + .feature-list section + { + border-top: solid 1px #eee; + } + + /* Ugh ... disgusting. */ + .feature-list > div > div:first-child > div:first-child > section + { + border-top: 0; + padding-top: 0; + } + + .feature-list h3 + { + position: relative; + padding: 4px 0 0 48px; + line-height: 1.25em; + } + + .feature-list h3:before + { + position: absolute; + left: 0; + top: 0; + width: 32px; + height: 32px; + line-height: 32px; + font-size: 16px; + } + + .feature-list p + { + margin: 0 0 0 48px; + } + + /* Box */ + + .box + { + } + + .box.post-excerpt + { + } + + .box.post-excerpt .image.left + { + position: relative; + top: 0.25em; + width: 25%; + margin: 0; + } + + .box.post-excerpt h3, + .box.post-excerpt p + { + margin-left: 32.5%; + } + +/*********************************************************************************/ +/* Mobile UI */ +/*********************************************************************************/ + + #titleBar + { + background: none; + } + + #titleBar .title + { + display: none; + } + + #titleBar .toggle + { + position: absolute; + top: 0; + left: 0; + width: 60px; + height: 44px; + } + + #titleBar .toggle:before + { + font-family: FontAwesome; + text-decoration: none; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing:antialiased; + -moz-osx-font-smoothing:grayscale; + + content: '\f0c9'; + font-size: 14px; + position: absolute; + top: 6px; + left: 6px; + display: block; + width: 54px; + height: 38px; + line-height: 38px; + text-align: center; + color: rgba(255,255,255,0.75); + background-color: rgba(92,95,103,0.5); + border-radius: 0.25em; + -moz-transition: all .15s ease-in-out; + -webkit-transition: all .15s ease-in-out; + -o-transition: all .15s ease-in-out; + -ms-transition: all .15s ease-in-out; + transition: all .15s ease-in-out; + } + + #titleBar .toggle:active:before + { + background-color: rgba(92,95,103,0.75); + } + + #navPanel + { + background: #242730 url('images/overlay.png'); + box-shadow: inset -3px 0px 4px 0px rgba(0,0,0,0.1); + } + + #navPanel .link + { + display: block; + color: rgba(255,255,255,0.5); + text-transform: uppercase; + text-decoration: none; + font-size: 0.85em; + letter-spacing: 0.15em; + text-decoration: none; + height: 44px; + line-height: 44px; + border-top: solid 1px rgba(255,255,255,0.05); + margin: 0 15px 0 15px; + } + + #navPanel .link:first-child + { + border-top: 0; + } + + #navPanel .indent-1 { display: inline-block; width: 1em; } + #navPanel .indent-2 { display: inline-block; width: 2em; } + #navPanel .indent-3 { display: inline-block; width: 3em; } + #navPanel .indent-4 { display: inline-block; width: 4em; } + #navPanel .indent-5 { display: inline-block; width: 5em; } + #navPanel .depth-0 { color: #fff; } + +/*********************************************************************************/ +/* Wrappers */ +/*********************************************************************************/ + + .wrapper + { + padding: 15px 15px 5em 15px; + } + + .wrapper .title + { + font-size: 0.9em; + width: 18em; + height: 2.5em; + top: -2.5em; + line-height: 2.5em; + margin-bottom: -2.5em; + margin-left: -9em; + padding-top: 0.5em; + } + + .wrapper .title:before, + .wrapper .title:after + { + height: 15px; + bottom: -15px; + background-size: 100% 100%; + } + + #header-wrapper + { + padding: 6em 2em 6em 2em; + } + + #footer-wrapper + { + padding-top: 3em; + } + + #footer-wrapper .feature-list section + { + border-top-color: #eee; + border-top-color: rgba(255,255,255,0.05); + } + +/*********************************************************************************/ +/* Header */ +/*********************************************************************************/ + + #header + { + } + +/*********************************************************************************/ +/* Logo */ +/*********************************************************************************/ + + #logo + { + text-align: center; + } + + #logo h1 + { + font-size: 1.5em; + letter-spacing: 0.2em; + } + + #logo p + { + margin: 1.25em 0 0 0; + display: block; + letter-spacing: 0.2em; + font-size: 0.9em; + } + +/*********************************************************************************/ +/* Nav */ +/*********************************************************************************/ + + #nav + { + display: none; + } + +/*********************************************************************************/ +/* Intro */ +/*********************************************************************************/ + + #intro + { + text-align: center; + padding: 1em 2em 1em 2em !important; + margin: 0 auto; + } + + #intro .style2 + { + font-size: 1.5em; + letter-spacing: 0.05em; + line-height: 1.25em; + padding: 1.25em; + } + +/*********************************************************************************/ +/* Main */ +/*********************************************************************************/ + + #main + { + padding: 1em 0 0 0; + } + +/*********************************************************************************/ +/* Content */ +/*********************************************************************************/ + + #content + { + padding: 0 0 2em 0; + } + + #content header.style1 + { + padding-bottom: 2.5em; + } + +/*********************************************************************************/ +/* Footer */ +/*********************************************************************************/ + + #footer + { + } + + #footer hr + { + display: none; + } + +/*********************************************************************************/ +/* Copyright */ +/*********************************************************************************/ + + #copyright + { + padding: 2em 0 0 0; + } + + #copyright ul + { + padding: 1em 2em; + width: 100%; + } + + #copyright ul li + { + display: block; + margin: 0.5em 0 0 0; + } + + #copyright ul li:first-child + { + margin-top: 0; } \ No newline at end of file diff --git a/www/css/style.css b/www/new_webend/css/style.css similarity index 94% rename from www/css/style.css rename to www/new_webend/css/style.css index 1126b51..44b859f 100644 --- a/www/css/style.css +++ b/www/new_webend/css/style.css @@ -1,870 +1,870 @@ -@charset 'UTF-8'; -@import url('http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,700,900'); -@import url('font-awesome.min.css'); - -/* - Escape Velocity by HTML5 UP - html5up.net | @n33co - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) -*/ - -/*********************************************************************************/ -/* Basic */ -/*********************************************************************************/ - - body, input, textarea, select - { - font-family: 'Source Sans Pro', sans-serif; - font-weight: 400; - color: #919499; - } - - body.is-loading * - { - -moz-transition: none !important; - -webkit-transition: none !important; - -o-transition: none !important; - -ms-transition: none !important; - transition: none !important; - -moz-animation: none !important; - -webkit-animation: none !important; - -o-animation: none !important; - -ms-animation: none !important; - animation: none !important; - } - - h1,h2,h3,h4,h5,h6 - { - font-weight: 700; - color: #484d55; - } - - h1 a, h2 a, h3 a, h4 a, h5 a, h6 a - { - color: inherit; - text-decoration: none; - } - - a - { - text-decoration: underline; - color: #717479; - -moz-transition: color .25s ease-in-out; - -webkit-transition: color .25s ease-in-out; - -o-transition: color .25s ease-in-out; - -ms-transition: color .25s ease-in-out; - transition: color .25s ease-in-out; - } - - a:hover - { - text-decoration: none; - } - - strong, b - { - font-weight: 700; - color: #484d55; - } - - blockquote - { - border-left: solid 0.5em #ddd; - padding: 1em 0 1em 2em; - font-style: italic; - } - - em, i - { - font-style: italic; - } - - hr - { - border: 0; - border-top: solid 1px #ddd; - } - - sub - { - position: relative; - top: 0.5em; - font-size: 0.8em; - } - - sup - { - position: relative; - top: -0.5em; - font-size: 0.8em; - } - - .nobr - { - white-space: nowrap; - } - - br.clear - { - clear: both; - } - - p, ul, ol, dl, table, blockquote, form - { - margin-bottom: 2em; - } - - /* Table */ - - table - { - width: 100%; - } - - table.default - { - width: 100%; - } - - table.default tbody tr:nth-child(2n+2) - { - background: #f4f4f4; - } - - table.default td - { - padding: 0.5em 1em 0.5em 1em; - } - - table.default th - { - text-align: left; - font-weight: 400; - padding: 0.5em 1em 0.5em 1em; - } - - table.default thead - { - background: #484d55; - color: #fff; - } - - table.default tfoot - { - background: #eee; - } - - table.default tbody - { - } - - /* Form */ - - form - { - } - - form label - { - display: block; - font-weight: 700; - color: #484d55; - } - - form input[type="text"], - form input[type="email"], - form input[type="password"], - form select, - form textarea - { - -webkit-appearance: none; - display: block; - border: 0; - background: #eee; - box-shadow: inset 0px 0px 1px 0px #a0a1a7; - border-radius: 0.35em; - width: 100%; - padding: 0.75em 1em 0.75em 1em; - -moz-transition: all .25s ease-in-out; - -webkit-transition: all .25s ease-in-out; - -o-transition: all .25s ease-in-out; - -ms-transition: all .25s ease-in-out; - transition: all .25s ease-in-out; - } - - form input[type="text"], - form input[type="email"], - form input[type="password"], - form select - { - line-height: 1em; - } - - form textarea - { - min-height: 10em; - } - - form input[type="text"]:focus, - form input[type="email"]:focus, - form input[type="password"]:focus, - form select:focus, - form textarea:focus - { - background: #f8f8f8; - } - - form .formerize-placeholder - { - color: #555 !important; - font-style: italic; - } - - form ::-webkit-input-placeholder - { - color: #555 !important; - font-style: italic; - line-height: 1.35em; - } - - form :-moz-placeholder - { - color: #555 !important; - font-style: italic; - } - - form ::-moz-placeholder - { - color: #555 !important; - font-style: italic; - } - - form :-ms-input-placeholder - { - color: #555 !important; - font-style: italic; - } - - form ::-moz-focus-inner - { - border: 0; - } - - /* Section/Article */ - - section, - article - { - margin-bottom: 3em; - } - - section > :last-child, - article > :last-child - { - margin-bottom: 0; - } - - section:last-child, - article:last-child - { - margin-bottom: 0; - } - - header.style1 - { - text-align: center; - } - - header.style1 h2 - { - font-weight: 700; - } - - header.style1 p - { - color: #b1b4b9; - } - - /* Image */ - - .image - { - display: inline-block; - } - - .image img - { - display: block; - width: 100%; - } - - .image.fit - { - display: block; - width: 100%; - } - - .image.left - { - float: left; - margin: 0 2em 2em 0; - } - - .image.centered - { - display: block; - margin: 0 0 2em 0; - } - - .image.centered img - { - margin: 0 auto; - width: auto; - } - - .image.featured - { - display: block; - width: 100%; - margin: 0 0 2em 0; - } - - /* Button */ - - input[type="button"], - input[type="submit"], - input[type="reset"], - .button - { - display: inline-block; - background: #444; - text-align: center; - text-transform: uppercase; - font-weight: 700; - letter-spacing: 0.25em; - text-decoration: none; - border-radius: 0.35em; - border: 0; - outline: 0; - cursor: pointer; - -moz-transition: all .25s ease-in-out; - -webkit-transition: all .25s ease-in-out; - -o-transition: all .25s ease-in-out; - -ms-transition: all .25s ease-in-out; - transition: all .25s ease-in-out; - } - - input[type="button"].style1, - input[type="submit"].style1, - input[type="reset"].style1, - .button.style1 - { - background: #e97770 url('images/overlay.png'); - color: #fff; - } - - input[type="button"].style1:hover, - input[type="submit"].style1:hover, - input[type="reset"].style1:hover, - .button.style1:hover - { - background-color: #f98780; - } - - input[type="button"].style1:active, - input[type="submit"].style1:active, - input[type="reset"].style1:active, - .button.style1:active - { - background-color: #d96760; - } - - input[type="button"].style2, - input[type="submit"].style2, - input[type="reset"].style2, - .button.style2 - { - background: none; - color: #606167; - box-shadow: inset 0px 0px 2px 0px #a0a1a7; - } - - input[type="button"].style2:hover, - input[type="submit"].style2:hover, - input[type="reset"].style2:hover, - .button.style2:hover - { - box-shadow: inset 0px 0px 2px 0px #606167; - } - - input[type="button"].style2:active, - input[type="submit"].style2:active, - input[type="reset"].style2:active, - .button.style2:active - { - box-shadow: inset 0px 0px 2px 0px #202127; - } - - input[type="button"].style3, - input[type="submit"].style3, - input[type="reset"].style3, - .button.style3 - { - background: #2f333b url('images/overlay.png'); - color: #fff; - } - - input[type="button"].style3:hover, - input[type="submit"].style3:hover, - input[type="reset"].style3:hover, - .button.style3:hover - { - background-color: #3f434b; - } - - input[type="button"].style3:active, - input[type="submit"].style3:active, - input[type="reset"].style3:active, - .button.style3:active - { - background-color: #1f232b; - } - - /* List */ - - ul.default - { - list-style: disc; - padding-left: 1em; - } - - ul.default li - { - padding-left: 0.5em; - } - - ul.style2 - { - } - - ul.style2 li - { - border-top: solid 1px #eee; - padding: 1.5em 0 0 0; - margin: 1.5em 0 0 0; - } - - ul.style2 li:first-child - { - border-top: 0; - padding-top: 0; - margin-top: 0; - } - - ul.style3 - { - } - - ul.style3 li - { - border-top: solid 1px #eee; - padding: 0.5em 0 0 0; - margin: 0.5em 0 0 0; - } - - ul.style3 li:first-child - { - border-top: 0; - padding-top: 0; - margin-top: 0; - } - - ol - { - } - - ol.default - { - list-style: decimal; - padding-left: 1.25em; - } - - ol.default li - { - padding-left: 0.25em; - } - - /* Feature List */ - - .feature-list - { - } - - .feature-list h3 - { - color: #e97770 !important; - } - - .feature-list h3:before - { - position: relative; - display: inline-block; - color: #fff; - background: #2f333b url('images/overlay.png'); - border-radius: 1em; - text-align: center; - } - -/*********************************************************************************/ -/* Icons */ -/*********************************************************************************/ - - .icon { - text-decoration: none; - } - - .icon:before { - display: inline-block; - font-family: FontAwesome; - font-size: 1.25em; - text-decoration: none; - font-style: normal; - font-weight: normal; - line-height: 1; - -webkit-font-smoothing:antialiased; - -moz-osx-font-smoothing:grayscale; - } - - .icon > .label { - display: none; - } - -/*********************************************************************************/ -/* Wrappers */ -/*********************************************************************************/ - - .wrapper - { - position: relative; - } - - .wrapper .title - { - position: absolute; - top: 0; - left: 50%; - text-align: center; - text-transform: uppercase; - display: block; - font-weight: 700; - letter-spacing: 0.25em; - } - - .wrapper .title:before - { - content: ''; - position: absolute; - bottom: -38px; - left: -35px; - width: 35px; - height: 38px; - background: url('images/shadow.png'); - } - - .wrapper .title:after - { - content: ''; - position: absolute; - bottom: -38px; - right: -35px; - width: 35px; - height: 38px; - background: url('images/shadow.png'); - -moz-transform: scaleX(-1); - -webkit-transform: scaleX(-1); - -o-transform: scaleX(-1); - -ms-transform: scaleX(-1); - transform: scaleX(-1); - } - - .wrapper.style1 - { - background: #e97770 url('images/overlay.png'); - color: #eee; - color: rgba(255,255,255,0.75); - } - - .wrapper.style1 .title - { - background: #e97770 url('images/overlay.png'); - color: #fff; - } - - .wrapper.style1 h1, - .wrapper.style1 h2, - .wrapper.style1 h3, - .wrapper.style1 h4, - .wrapper.style1 h5, - .wrapper.style1 h6, - .wrapper.style1 strong, - .wrapper.style1 b, - .wrapper.style1 a - { - color: #fff; - } - - .wrapper.style2 - { - background: #fff; - } - - .wrapper.style2 .title - { - background: #fff; - color: #484d55; - } - - .wrapper.style3 - { - background: #f3f3f3 url('images/overlay.png'); - } - - .wrapper.style3 .title - { - background: #f3f3f3 url('images/overlay.png'); - color: #484d55; - } - - .wrapper.style3 .image - { - border: solid 10px #fff; - } - - #header-wrapper - { - background: url('../images/banner.jpg') center center; - background-size: cover; - } - - #header-wrapper:before - { - content: ''; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: url('images/overlay.png'); - } - - #footer-wrapper - { - background: #282b34 url('images/overlay.png'); - color: #eee; - color: rgba(255,255,255,0.5); - } - - #footer-wrapper h1, - #footer-wrapper h2, - #footer-wrapper h3, - #footer-wrapper h4, - #footer-wrapper h5, - #footer-wrapper h6, - #footer-wrapper strong, - #footer-wrapper b, - #footer-wrapper a - { - color: #fff; - } - - #footer-wrapper hr - { - border-top-color: #333; - border-top-color: rgba(255,255,255,0.05); - } - - #footer-wrapper form - { - } - - #footer-wrapper form input[type="text"], - #footer-wrapper form input[type="email"], - #footer-wrapper form input[type="password"], - #footer-wrapper form select, - #footer-wrapper form textarea - { - background: #ccc; - box-shadow: none; - } - - #footer-wrapper form input[type="text"]:focus, - #footer-wrapper form input[type="email"]:focus, - #footer-wrapper form input[type="password"]:focus, - #footer-wrapper form select:focus, - #footer-wrapper form textarea:focus - { - background: #fff; - } - - #footer-wrapper input[type="button"].style2, - #footer-wrapper input[type="submit"].style2, - #footer-wrapper input[type="reset"].style2, - #footer-wrapper .button.style2 - { - color: #aaa; - box-shadow: inset 0px 0px 2px 0px rgba(255,255,255,0.5); - } - - #footer-wrapper input[type="button"].style2:hover, - #footer-wrapper input[type="submit"].style2:hover, - #footer-wrapper input[type="reset"].style2:hover, - #footer-wrapper .button.style2:hover - { - color: #ccc; - box-shadow: inset 0px 0px 2px 0px rgba(255,255,255,0.65); - } - - #footer-wrapper input[type="button"].style2:active, - #footer-wrapper input[type="submit"].style2:active, - #footer-wrapper input[type="reset"].style2:active, - #footer-wrapper .button.style2:active - { - box-shadow: inset 0px 0px 2px 0px rgba(255,255,255,0.75); - } - - #footer-wrapper .title - { - background: #282b34 url('images/overlay.png'); - color: #eee; - } - - #footer-wrapper header.style1 - { - } - - #footer-wrapper header.style1 h2 - { - color: #fff; - } - - #footer-wrapper header.style1 .p - { - color: inherit; - } - - #footer-wrapper .feature-list - { - } - - #footer-wrapper .feature-list section - { - border-top-color: #333; - border-top-color: rgba(255,255,255,0.05); - } - - #footer-wrapper .feature-list h3 - { - } - - #footer-wrapper .feature-list h3:before - { - background: #3d4249 url('images/overlay.png'); - } - -/*********************************************************************************/ -/* Logo */ -/*********************************************************************************/ - - #logo - { - } - - #logo h1 - { - font-weight: 900; - text-transform: uppercase; - color: #fff; - } - - #logo p - { - color: #eee; - color: rgba(255,255,255,0.5); - text-transform: uppercase; - } - -/*********************************************************************************/ -/* Intro */ -/*********************************************************************************/ - - #intro - { - } - - #intro > .style1 - { - } - - #intro > .style2 - { - font-weight: 700; - color: #fff; - border-radius: 0.35em; - box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.25); - } - - #intro > .style2 a - { - color: inherit; - text-decoration: none; - } - - #intro > .style3 - { - } - -/*********************************************************************************/ -/* Highlights */ -/*********************************************************************************/ - - #highlights - { - } - - #highlights .highlight - { - text-align: center; - } - - #highlights .highlight h3 - { - color: #e97770; - } - -/*********************************************************************************/ -/* Copyright */ -/*********************************************************************************/ - - #copyright - { - text-align: center; - } - - #copyright ul - { - display: inline-block; - border-radius: 0.35em; - box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.05); - color: #aaa; - color: rgba(255,255,255,0.25); - } - - #copyright a - { - color: inherit; - } - - #copyright a:hover - { - color: #fff; +@charset 'UTF-8'; +@import url('http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,700,900'); +@import url('font-awesome.min.css'); + +/* + Escape Velocity by HTML5 UP + html5up.net | @n33co + Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) +*/ + +/*********************************************************************************/ +/* Basic */ +/*********************************************************************************/ + + body, input, textarea, select + { + font-family: 'Source Sans Pro', sans-serif; + font-weight: 400; + color: #919499; + } + + body.is-loading * + { + -moz-transition: none !important; + -webkit-transition: none !important; + -o-transition: none !important; + -ms-transition: none !important; + transition: none !important; + -moz-animation: none !important; + -webkit-animation: none !important; + -o-animation: none !important; + -ms-animation: none !important; + animation: none !important; + } + + h1,h2,h3,h4,h5,h6 + { + font-weight: 700; + color: #484d55; + } + + h1 a, h2 a, h3 a, h4 a, h5 a, h6 a + { + color: inherit; + text-decoration: none; + } + + a + { + text-decoration: underline; + color: #717479; + -moz-transition: color .25s ease-in-out; + -webkit-transition: color .25s ease-in-out; + -o-transition: color .25s ease-in-out; + -ms-transition: color .25s ease-in-out; + transition: color .25s ease-in-out; + } + + a:hover + { + text-decoration: none; + } + + strong, b + { + font-weight: 700; + color: #484d55; + } + + blockquote + { + border-left: solid 0.5em #ddd; + padding: 1em 0 1em 2em; + font-style: italic; + } + + em, i + { + font-style: italic; + } + + hr + { + border: 0; + border-top: solid 1px #ddd; + } + + sub + { + position: relative; + top: 0.5em; + font-size: 0.8em; + } + + sup + { + position: relative; + top: -0.5em; + font-size: 0.8em; + } + + .nobr + { + white-space: nowrap; + } + + br.clear + { + clear: both; + } + + p, ul, ol, dl, table, blockquote, form + { + margin-bottom: 2em; + } + + /* Table */ + + table + { + width: 100%; + } + + table.default + { + width: 100%; + } + + table.default tbody tr:nth-child(2n+2) + { + background: #f4f4f4; + } + + table.default td + { + padding: 0.5em 1em 0.5em 1em; + } + + table.default th + { + text-align: left; + font-weight: 400; + padding: 0.5em 1em 0.5em 1em; + } + + table.default thead + { + background: #484d55; + color: #fff; + } + + table.default tfoot + { + background: #eee; + } + + table.default tbody + { + } + + /* Form */ + + form + { + } + + form label + { + display: block; + font-weight: 700; + color: #484d55; + } + + form input[type="text"], + form input[type="email"], + form input[type="password"], + form select, + form textarea + { + -webkit-appearance: none; + display: block; + border: 0; + background: #eee; + box-shadow: inset 0px 0px 1px 0px #a0a1a7; + border-radius: 0.35em; + width: 100%; + padding: 0.75em 1em 0.75em 1em; + -moz-transition: all .25s ease-in-out; + -webkit-transition: all .25s ease-in-out; + -o-transition: all .25s ease-in-out; + -ms-transition: all .25s ease-in-out; + transition: all .25s ease-in-out; + } + + form input[type="text"], + form input[type="email"], + form input[type="password"], + form select + { + line-height: 1em; + } + + form textarea + { + min-height: 10em; + } + + form input[type="text"]:focus, + form input[type="email"]:focus, + form input[type="password"]:focus, + form select:focus, + form textarea:focus + { + background: #f8f8f8; + } + + form .formerize-placeholder + { + color: #555 !important; + font-style: italic; + } + + form ::-webkit-input-placeholder + { + color: #555 !important; + font-style: italic; + line-height: 1.35em; + } + + form :-moz-placeholder + { + color: #555 !important; + font-style: italic; + } + + form ::-moz-placeholder + { + color: #555 !important; + font-style: italic; + } + + form :-ms-input-placeholder + { + color: #555 !important; + font-style: italic; + } + + form ::-moz-focus-inner + { + border: 0; + } + + /* Section/Article */ + + section, + article + { + margin-bottom: 3em; + } + + section > :last-child, + article > :last-child + { + margin-bottom: 0; + } + + section:last-child, + article:last-child + { + margin-bottom: 0; + } + + header.style1 + { + text-align: center; + } + + header.style1 h2 + { + font-weight: 700; + } + + header.style1 p + { + color: #b1b4b9; + } + + /* Image */ + + .image + { + display: inline-block; + } + + .image img + { + display: block; + width: 100%; + } + + .image.fit + { + display: block; + width: 100%; + } + + .image.left + { + float: left; + margin: 0 2em 2em 0; + } + + .image.centered + { + display: block; + margin: 0 0 2em 0; + } + + .image.centered img + { + margin: 0 auto; + width: auto; + } + + .image.featured + { + display: block; + width: 100%; + margin: 0 0 2em 0; + } + + /* Button */ + + input[type="button"], + input[type="submit"], + input[type="reset"], + .button + { + display: inline-block; + background: #444; + text-align: center; + text-transform: uppercase; + font-weight: 700; + letter-spacing: 0.25em; + text-decoration: none; + border-radius: 0.35em; + border: 0; + outline: 0; + cursor: pointer; + -moz-transition: all .25s ease-in-out; + -webkit-transition: all .25s ease-in-out; + -o-transition: all .25s ease-in-out; + -ms-transition: all .25s ease-in-out; + transition: all .25s ease-in-out; + } + + input[type="button"].style1, + input[type="submit"].style1, + input[type="reset"].style1, + .button.style1 + { + background: #e97770 url('images/overlay.png'); + color: #fff; + } + + input[type="button"].style1:hover, + input[type="submit"].style1:hover, + input[type="reset"].style1:hover, + .button.style1:hover + { + background-color: #f98780; + } + + input[type="button"].style1:active, + input[type="submit"].style1:active, + input[type="reset"].style1:active, + .button.style1:active + { + background-color: #d96760; + } + + input[type="button"].style2, + input[type="submit"].style2, + input[type="reset"].style2, + .button.style2 + { + background: none; + color: #606167; + box-shadow: inset 0px 0px 2px 0px #a0a1a7; + } + + input[type="button"].style2:hover, + input[type="submit"].style2:hover, + input[type="reset"].style2:hover, + .button.style2:hover + { + box-shadow: inset 0px 0px 2px 0px #606167; + } + + input[type="button"].style2:active, + input[type="submit"].style2:active, + input[type="reset"].style2:active, + .button.style2:active + { + box-shadow: inset 0px 0px 2px 0px #202127; + } + + input[type="button"].style3, + input[type="submit"].style3, + input[type="reset"].style3, + .button.style3 + { + background: #2f333b url('images/overlay.png'); + color: #fff; + } + + input[type="button"].style3:hover, + input[type="submit"].style3:hover, + input[type="reset"].style3:hover, + .button.style3:hover + { + background-color: #3f434b; + } + + input[type="button"].style3:active, + input[type="submit"].style3:active, + input[type="reset"].style3:active, + .button.style3:active + { + background-color: #1f232b; + } + + /* List */ + + ul.default + { + list-style: disc; + padding-left: 1em; + } + + ul.default li + { + padding-left: 0.5em; + } + + ul.style2 + { + } + + ul.style2 li + { + border-top: solid 1px #eee; + padding: 1.5em 0 0 0; + margin: 1.5em 0 0 0; + } + + ul.style2 li:first-child + { + border-top: 0; + padding-top: 0; + margin-top: 0; + } + + ul.style3 + { + } + + ul.style3 li + { + border-top: solid 1px #eee; + padding: 0.5em 0 0 0; + margin: 0.5em 0 0 0; + } + + ul.style3 li:first-child + { + border-top: 0; + padding-top: 0; + margin-top: 0; + } + + ol + { + } + + ol.default + { + list-style: decimal; + padding-left: 1.25em; + } + + ol.default li + { + padding-left: 0.25em; + } + + /* Feature List */ + + .feature-list + { + } + + .feature-list h3 + { + color: #e97770 !important; + } + + .feature-list h3:before + { + position: relative; + display: inline-block; + color: #fff; + background: #2f333b url('images/overlay.png'); + border-radius: 1em; + text-align: center; + } + +/*********************************************************************************/ +/* Icons */ +/*********************************************************************************/ + + .icon { + text-decoration: none; + } + + .icon:before { + display: inline-block; + font-family: FontAwesome; + font-size: 1.25em; + text-decoration: none; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing:antialiased; + -moz-osx-font-smoothing:grayscale; + } + + .icon > .label { + display: none; + } + +/*********************************************************************************/ +/* Wrappers */ +/*********************************************************************************/ + + .wrapper + { + position: relative; + } + + .wrapper .title + { + position: absolute; + top: 0; + left: 50%; + text-align: center; + text-transform: uppercase; + display: block; + font-weight: 700; + letter-spacing: 0.25em; + } + + .wrapper .title:before + { + content: ''; + position: absolute; + bottom: -38px; + left: -35px; + width: 35px; + height: 38px; + background: url('images/shadow.png'); + } + + .wrapper .title:after + { + content: ''; + position: absolute; + bottom: -38px; + right: -35px; + width: 35px; + height: 38px; + background: url('images/shadow.png'); + -moz-transform: scaleX(-1); + -webkit-transform: scaleX(-1); + -o-transform: scaleX(-1); + -ms-transform: scaleX(-1); + transform: scaleX(-1); + } + + .wrapper.style1 + { + background: #e97770 url('images/overlay.png'); + color: #eee; + color: rgba(255,255,255,0.75); + } + + .wrapper.style1 .title + { + background: #e97770 url('images/overlay.png'); + color: #fff; + } + + .wrapper.style1 h1, + .wrapper.style1 h2, + .wrapper.style1 h3, + .wrapper.style1 h4, + .wrapper.style1 h5, + .wrapper.style1 h6, + .wrapper.style1 strong, + .wrapper.style1 b, + .wrapper.style1 a + { + color: #fff; + } + + .wrapper.style2 + { + background: #fff; + } + + .wrapper.style2 .title + { + background: #fff; + color: #484d55; + } + + .wrapper.style3 + { + background: #f3f3f3 url('images/overlay.png'); + } + + .wrapper.style3 .title + { + background: #f3f3f3 url('images/overlay.png'); + color: #484d55; + } + + .wrapper.style3 .image + { + border: solid 10px #fff; + } + + #header-wrapper + { + background: url('../images/banner.jpg') center center; + background-size: cover; + } + + #header-wrapper:before + { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: url('images/overlay.png'); + } + + #footer-wrapper + { + background: #282b34 url('images/overlay.png'); + color: #eee; + color: rgba(255,255,255,0.5); + } + + #footer-wrapper h1, + #footer-wrapper h2, + #footer-wrapper h3, + #footer-wrapper h4, + #footer-wrapper h5, + #footer-wrapper h6, + #footer-wrapper strong, + #footer-wrapper b, + #footer-wrapper a + { + color: #fff; + } + + #footer-wrapper hr + { + border-top-color: #333; + border-top-color: rgba(255,255,255,0.05); + } + + #footer-wrapper form + { + } + + #footer-wrapper form input[type="text"], + #footer-wrapper form input[type="email"], + #footer-wrapper form input[type="password"], + #footer-wrapper form select, + #footer-wrapper form textarea + { + background: #ccc; + box-shadow: none; + } + + #footer-wrapper form input[type="text"]:focus, + #footer-wrapper form input[type="email"]:focus, + #footer-wrapper form input[type="password"]:focus, + #footer-wrapper form select:focus, + #footer-wrapper form textarea:focus + { + background: #fff; + } + + #footer-wrapper input[type="button"].style2, + #footer-wrapper input[type="submit"].style2, + #footer-wrapper input[type="reset"].style2, + #footer-wrapper .button.style2 + { + color: #aaa; + box-shadow: inset 0px 0px 2px 0px rgba(255,255,255,0.5); + } + + #footer-wrapper input[type="button"].style2:hover, + #footer-wrapper input[type="submit"].style2:hover, + #footer-wrapper input[type="reset"].style2:hover, + #footer-wrapper .button.style2:hover + { + color: #ccc; + box-shadow: inset 0px 0px 2px 0px rgba(255,255,255,0.65); + } + + #footer-wrapper input[type="button"].style2:active, + #footer-wrapper input[type="submit"].style2:active, + #footer-wrapper input[type="reset"].style2:active, + #footer-wrapper .button.style2:active + { + box-shadow: inset 0px 0px 2px 0px rgba(255,255,255,0.75); + } + + #footer-wrapper .title + { + background: #282b34 url('images/overlay.png'); + color: #eee; + } + + #footer-wrapper header.style1 + { + } + + #footer-wrapper header.style1 h2 + { + color: #fff; + } + + #footer-wrapper header.style1 .p + { + color: inherit; + } + + #footer-wrapper .feature-list + { + } + + #footer-wrapper .feature-list section + { + border-top-color: #333; + border-top-color: rgba(255,255,255,0.05); + } + + #footer-wrapper .feature-list h3 + { + } + + #footer-wrapper .feature-list h3:before + { + background: #3d4249 url('images/overlay.png'); + } + +/*********************************************************************************/ +/* Logo */ +/*********************************************************************************/ + + #logo + { + } + + #logo h1 + { + font-weight: 900; + text-transform: uppercase; + color: #fff; + } + + #logo p + { + color: #eee; + color: rgba(255,255,255,0.5); + text-transform: uppercase; + } + +/*********************************************************************************/ +/* Intro */ +/*********************************************************************************/ + + #intro + { + } + + #intro > .style1 + { + } + + #intro > .style2 + { + font-weight: 700; + color: #fff; + border-radius: 0.35em; + box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.25); + } + + #intro > .style2 a + { + color: inherit; + text-decoration: none; + } + + #intro > .style3 + { + } + +/*********************************************************************************/ +/* Highlights */ +/*********************************************************************************/ + + #highlights + { + } + + #highlights .highlight + { + text-align: center; + } + + #highlights .highlight h3 + { + color: #e97770; + } + +/*********************************************************************************/ +/* Copyright */ +/*********************************************************************************/ + + #copyright + { + text-align: center; + } + + #copyright ul + { + display: inline-block; + border-radius: 0.35em; + box-shadow: inset 0px 0px 1px 1px rgba(255,255,255,0.05); + color: #aaa; + color: rgba(255,255,255,0.25); + } + + #copyright a + { + color: inherit; + } + + #copyright a:hover + { + color: #fff; } \ No newline at end of file diff --git a/www/css/usermod.css b/www/new_webend/css/usermod.css similarity index 100% rename from www/css/usermod.css rename to www/new_webend/css/usermod.css diff --git a/www/eintragen.html b/www/new_webend/eintragen.html similarity index 100% rename from www/eintragen.html rename to www/new_webend/eintragen.html diff --git a/www/eintragen.php b/www/new_webend/eintragen.php similarity index 100% rename from www/eintragen.php rename to www/new_webend/eintragen.php diff --git a/www/fonts/FontAwesome.otf b/www/new_webend/fonts/FontAwesome.otf similarity index 100% rename from www/fonts/FontAwesome.otf rename to www/new_webend/fonts/FontAwesome.otf diff --git a/www/fonts/fontawesome-webfont.eot b/www/new_webend/fonts/fontawesome-webfont.eot similarity index 100% rename from www/fonts/fontawesome-webfont.eot rename to www/new_webend/fonts/fontawesome-webfont.eot diff --git a/www/fonts/fontawesome-webfont.svg b/www/new_webend/fonts/fontawesome-webfont.svg similarity index 100% rename from www/fonts/fontawesome-webfont.svg rename to www/new_webend/fonts/fontawesome-webfont.svg diff --git a/www/fonts/fontawesome-webfont.ttf b/www/new_webend/fonts/fontawesome-webfont.ttf similarity index 100% rename from www/fonts/fontawesome-webfont.ttf rename to www/new_webend/fonts/fontawesome-webfont.ttf diff --git a/www/fonts/fontawesome-webfont.woff b/www/new_webend/fonts/fontawesome-webfont.woff similarity index 100% rename from www/fonts/fontawesome-webfont.woff rename to www/new_webend/fonts/fontawesome-webfont.woff diff --git a/www/gfx/logo.png b/www/new_webend/gfx/logo.png similarity index 100% rename from www/gfx/logo.png rename to www/new_webend/gfx/logo.png diff --git a/www/images/banner.jpg b/www/new_webend/images/banner.jpg similarity index 100% rename from www/images/banner.jpg rename to www/new_webend/images/banner.jpg diff --git a/www/images/pic01.jpg b/www/new_webend/images/pic01.jpg similarity index 100% rename from www/images/pic01.jpg rename to www/new_webend/images/pic01.jpg diff --git a/www/images/pic02.jpg b/www/new_webend/images/pic02.jpg similarity index 100% rename from www/images/pic02.jpg rename to www/new_webend/images/pic02.jpg diff --git a/www/images/pic03.jpg b/www/new_webend/images/pic03.jpg similarity index 100% rename from www/images/pic03.jpg rename to www/new_webend/images/pic03.jpg diff --git a/www/images/pic04.jpg b/www/new_webend/images/pic04.jpg similarity index 100% rename from www/images/pic04.jpg rename to www/new_webend/images/pic04.jpg diff --git a/www/images/pic05.jpg b/www/new_webend/images/pic05.jpg similarity index 100% rename from www/images/pic05.jpg rename to www/new_webend/images/pic05.jpg diff --git a/www/images/pic06.jpg b/www/new_webend/images/pic06.jpg similarity index 100% rename from www/images/pic06.jpg rename to www/new_webend/images/pic06.jpg diff --git a/www/images/pic07.jpg b/www/new_webend/images/pic07.jpg similarity index 100% rename from www/images/pic07.jpg rename to www/new_webend/images/pic07.jpg diff --git a/www/images/pic08.jpg b/www/new_webend/images/pic08.jpg similarity index 100% rename from www/images/pic08.jpg rename to www/new_webend/images/pic08.jpg diff --git a/www/images/pic09.jpg b/www/new_webend/images/pic09.jpg similarity index 100% rename from www/images/pic09.jpg rename to www/new_webend/images/pic09.jpg diff --git a/www/images/pic10.jpg b/www/new_webend/images/pic10.jpg similarity index 100% rename from www/images/pic10.jpg rename to www/new_webend/images/pic10.jpg diff --git a/www/index.php b/www/new_webend/index.php similarity index 96% rename from www/index.php rename to www/new_webend/index.php index 64bb34c..c6165ce 100644 --- a/www/index.php +++ b/www/new_webend/index.php @@ -1,103 +1,103 @@ - - - - - - - - BOSwatch - - - - - - - - - - - - - - - -
- -
- - - - -
-
LOGIN
-
- -
-
-

Bitte melden sie sich an!



-Username:
-

- -Dein Passwort:
-
- - -
- -
- -
-
- - -
-
- - -
-
-
- - - - - + + + + + + + + BOSwatch + + + + + + + + + + + + + + + +
+ +
+ + + + +
+
LOGIN
+
+ +
+
+

Bitte melden sie sich an!



+Username:
+

+ +Dein Passwort:
+
+ + +
+ +
+ +
+
+ + +
+
+ + +
+
+
+ + + + + \ No newline at end of file diff --git a/www/js/init.js b/www/new_webend/js/init.js similarity index 98% rename from www/js/init.js rename to www/new_webend/js/init.js index 5bbfe61..b291217 100644 --- a/www/js/init.js +++ b/www/new_webend/js/init.js @@ -1,86 +1,86 @@ -/* - Escape Velocity by HTML5 UP - html5up.net | @n33co - Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) -*/ - -(function($) { - - skel.init({ - reset: 'full', - breakpoints: { - 'global': { range: '*', href: 'css/style.css' }, - 'desktop': { range: '737-', href: 'css/style-desktop.css', containers: 1200, grid: { gutters: 50 } }, - '1000px': { range: '737-1200', href: 'css/style-1000px.css', containers: 1000, grid: { gutters: 35 }, viewport: { width: 1080 } }, - 'mobile': { range: '-736', href: 'css/style-mobile.css', containers: '100%!', grid: { collapse: true, gutters: 20 }, viewport: { scalable: false } } - }, - plugins: { - layers: { - navPanel: { - hidden: true, - breakpoints: 'mobile', - position: 'top-left', - side: 'left', - animation: 'pushX', - width: '80%', - height: '100%', - clickToHide: true, - html: '
', - orientation: 'vertical' - }, - titleBar: { - breakpoints: 'mobile', - position: 'top-left', - side: 'top', - height: 44, - width: '100%', - html: '' - } - } - } - }); - - $(function() { - - var $window = $(window), - $body = $('body'); - - // Disable animations/transitions until the page has loaded. - $body.addClass('is-loading'); - - $window.on('load', function() { - $body.removeClass('is-loading'); - }); - - // Forms (IE<10). - var $form = $('form'); - if ($form.length > 0) { - - $form.find('.form-button-submit') - .on('click', function() { - $(this).parents('form').submit(); - return false; - }); - - if (skel.vars.IEVersion < 10) { - $.fn.n33_formerize=function(){var _fakes=new Array(),_form = $(this);_form.find('input[type=text],textarea').each(function() { var e = $(this); if (e.val() == '' || e.val() == e.attr('placeholder')) { e.addClass('formerize-placeholder'); e.val(e.attr('placeholder')); } }).blur(function() { var e = $(this); if (e.attr('name').match(/_fakeformerizefield$/)) return; if (e.val() == '') { e.addClass('formerize-placeholder'); e.val(e.attr('placeholder')); } }).focus(function() { var e = $(this); if (e.attr('name').match(/_fakeformerizefield$/)) return; if (e.val() == e.attr('placeholder')) { e.removeClass('formerize-placeholder'); e.val(''); } }); _form.find('input[type=password]').each(function() { var e = $(this); var x = $($('
').append(e.clone()).remove().html().replace(/type="password"/i, 'type="text"').replace(/type=password/i, 'type=text')); if (e.attr('id') != '') x.attr('id', e.attr('id') + '_fakeformerizefield'); if (e.attr('name') != '') x.attr('name', e.attr('name') + '_fakeformerizefield'); x.addClass('formerize-placeholder').val(x.attr('placeholder')).insertAfter(e); if (e.val() == '') e.hide(); else x.hide(); e.blur(function(event) { event.preventDefault(); var e = $(this); var x = e.parent().find('input[name=' + e.attr('name') + '_fakeformerizefield]'); if (e.val() == '') { e.hide(); x.show(); } }); x.focus(function(event) { event.preventDefault(); var x = $(this); var e = x.parent().find('input[name=' + x.attr('name').replace('_fakeformerizefield', '') + ']'); x.hide(); e.show().focus(); }); x.keypress(function(event) { event.preventDefault(); x.val(''); }); }); _form.submit(function() { $(this).find('input[type=text],input[type=password],textarea').each(function(event) { var e = $(this); if (e.attr('name').match(/_fakeformerizefield$/)) e.attr('name', ''); if (e.val() == e.attr('placeholder')) { e.removeClass('formerize-placeholder'); e.val(''); } }); }).bind("reset", function(event) { event.preventDefault(); $(this).find('select').val($('option:first').val()); $(this).find('input,textarea').each(function() { var e = $(this); var x; e.removeClass('formerize-placeholder'); switch (this.type) { case 'submit': case 'reset': break; case 'password': e.val(e.attr('defaultValue')); x = e.parent().find('input[name=' + e.attr('name') + '_fakeformerizefield]'); if (e.val() == '') { e.hide(); x.show(); } else { e.show(); x.hide(); } break; case 'checkbox': case 'radio': e.attr('checked', e.attr('defaultValue')); break; case 'text': case 'textarea': e.val(e.attr('defaultValue')); if (e.val() == '') { e.addClass('formerize-placeholder'); e.val(e.attr('placeholder')); } break; default: e.val(e.attr('defaultValue')); break; } }); window.setTimeout(function() { for (x in _fakes) _fakes[x].trigger('formerize_sync'); }, 10); }); return _form; }; - $form.n33_formerize(); - } - - } - - // CSS polyfills (IE<9). - if (skel.vars.IEVersion < 9) - $(':last-child').addClass('last-child'); - - // Dropdowns. - $('#nav > ul').dropotron({ - mode: 'fade', - noOpenerFade: true, - alignment: 'center', - detach: false - }); - - }); - +/* + Escape Velocity by HTML5 UP + html5up.net | @n33co + Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) +*/ + +(function($) { + + skel.init({ + reset: 'full', + breakpoints: { + 'global': { range: '*', href: 'css/style.css' }, + 'desktop': { range: '737-', href: 'css/style-desktop.css', containers: 1200, grid: { gutters: 50 } }, + '1000px': { range: '737-1200', href: 'css/style-1000px.css', containers: 1000, grid: { gutters: 35 }, viewport: { width: 1080 } }, + 'mobile': { range: '-736', href: 'css/style-mobile.css', containers: '100%!', grid: { collapse: true, gutters: 20 }, viewport: { scalable: false } } + }, + plugins: { + layers: { + navPanel: { + hidden: true, + breakpoints: 'mobile', + position: 'top-left', + side: 'left', + animation: 'pushX', + width: '80%', + height: '100%', + clickToHide: true, + html: '
', + orientation: 'vertical' + }, + titleBar: { + breakpoints: 'mobile', + position: 'top-left', + side: 'top', + height: 44, + width: '100%', + html: '' + } + } + } + }); + + $(function() { + + var $window = $(window), + $body = $('body'); + + // Disable animations/transitions until the page has loaded. + $body.addClass('is-loading'); + + $window.on('load', function() { + $body.removeClass('is-loading'); + }); + + // Forms (IE<10). + var $form = $('form'); + if ($form.length > 0) { + + $form.find('.form-button-submit') + .on('click', function() { + $(this).parents('form').submit(); + return false; + }); + + if (skel.vars.IEVersion < 10) { + $.fn.n33_formerize=function(){var _fakes=new Array(),_form = $(this);_form.find('input[type=text],textarea').each(function() { var e = $(this); if (e.val() == '' || e.val() == e.attr('placeholder')) { e.addClass('formerize-placeholder'); e.val(e.attr('placeholder')); } }).blur(function() { var e = $(this); if (e.attr('name').match(/_fakeformerizefield$/)) return; if (e.val() == '') { e.addClass('formerize-placeholder'); e.val(e.attr('placeholder')); } }).focus(function() { var e = $(this); if (e.attr('name').match(/_fakeformerizefield$/)) return; if (e.val() == e.attr('placeholder')) { e.removeClass('formerize-placeholder'); e.val(''); } }); _form.find('input[type=password]').each(function() { var e = $(this); var x = $($('
').append(e.clone()).remove().html().replace(/type="password"/i, 'type="text"').replace(/type=password/i, 'type=text')); if (e.attr('id') != '') x.attr('id', e.attr('id') + '_fakeformerizefield'); if (e.attr('name') != '') x.attr('name', e.attr('name') + '_fakeformerizefield'); x.addClass('formerize-placeholder').val(x.attr('placeholder')).insertAfter(e); if (e.val() == '') e.hide(); else x.hide(); e.blur(function(event) { event.preventDefault(); var e = $(this); var x = e.parent().find('input[name=' + e.attr('name') + '_fakeformerizefield]'); if (e.val() == '') { e.hide(); x.show(); } }); x.focus(function(event) { event.preventDefault(); var x = $(this); var e = x.parent().find('input[name=' + x.attr('name').replace('_fakeformerizefield', '') + ']'); x.hide(); e.show().focus(); }); x.keypress(function(event) { event.preventDefault(); x.val(''); }); }); _form.submit(function() { $(this).find('input[type=text],input[type=password],textarea').each(function(event) { var e = $(this); if (e.attr('name').match(/_fakeformerizefield$/)) e.attr('name', ''); if (e.val() == e.attr('placeholder')) { e.removeClass('formerize-placeholder'); e.val(''); } }); }).bind("reset", function(event) { event.preventDefault(); $(this).find('select').val($('option:first').val()); $(this).find('input,textarea').each(function() { var e = $(this); var x; e.removeClass('formerize-placeholder'); switch (this.type) { case 'submit': case 'reset': break; case 'password': e.val(e.attr('defaultValue')); x = e.parent().find('input[name=' + e.attr('name') + '_fakeformerizefield]'); if (e.val() == '') { e.hide(); x.show(); } else { e.show(); x.hide(); } break; case 'checkbox': case 'radio': e.attr('checked', e.attr('defaultValue')); break; case 'text': case 'textarea': e.val(e.attr('defaultValue')); if (e.val() == '') { e.addClass('formerize-placeholder'); e.val(e.attr('placeholder')); } break; default: e.val(e.attr('defaultValue')); break; } }); window.setTimeout(function() { for (x in _fakes) _fakes[x].trigger('formerize_sync'); }, 10); }); return _form; }; + $form.n33_formerize(); + } + + } + + // CSS polyfills (IE<9). + if (skel.vars.IEVersion < 9) + $(':last-child').addClass('last-child'); + + // Dropdowns. + $('#nav > ul').dropotron({ + mode: 'fade', + noOpenerFade: true, + alignment: 'center', + detach: false + }); + + }); + })(jQuery); \ No newline at end of file diff --git a/www/js/jquery.dropotron.min.js b/www/new_webend/js/jquery.dropotron.min.js similarity index 99% rename from www/js/jquery.dropotron.min.js rename to www/new_webend/js/jquery.dropotron.min.js index 0a86bd3..74fde86 100644 --- a/www/js/jquery.dropotron.min.js +++ b/www/new_webend/js/jquery.dropotron.min.js @@ -1,2 +1,2 @@ -/* jquery.dropotron.js v1.4.3 | (c) n33 | n33.co | MIT licensed */ +/* jquery.dropotron.js v1.4.3 | (c) n33 | n33.co | MIT licensed */ (function(e){var t="openerActiveClass",n="click touchend",r="left",i="doCollapseAll",s="position",o="trigger",u="disableSelection_dropotron",a="addClass",f="doCollapse",l=!1,c="outerWidth",h="removeClass",p="preventDefault",d="length",v="dropotron",m="clearTimeout",g="right",y="parent",b=!0,w="speed",E="none",S="stopPropagation",x="doExpand",T=":visible",N="absolute",C="css",k="center",L="toggle",A="baseZIndex",O="offsetX",M="alignment",_="submenuClassPrefix",D="children",P="hover",H="relative",B="doToggle",j="ul",F="z-index",I="opacity",q="find",R="opener",U="px",z=null,W="hide",X="offset",V="detach",$="fast";e.fn[u]=function(){return e(this)[C]("user-select",E)[C]("-khtml-user-select",E)[C]("-moz-user-select",E)[C]("-o-user-select",E)[C]("-webkit-user-select",E)},e.fn[v]=function(t){var n;if(this[d]==0)return e(this);if(this[d]>1)for(n=0;n0&&i.add(d).on("mouseleave",function(){window[m](at),at=window.setTimeout(function(){i[o](f)},et.hideDelay)}),i[u]()[W]()[a](et.menuClass)[C](s,N).on("mouseenter",function(){window[m](at)}).on(x,function(){var n,u,p,v,E,S,x,_,D,P,B;if(i.is(T))return l;window[m](at),nt.each(function(){var t=e(this);e.contains(t.get(0),d.get(0))||t[o](f)}),n=d[X](),u=d[s](),p=d[y]()[s](),v=d[c](),E=i[c](),S=i[C](F)==et[A];if(S){et[V]?x=n:x=u,P=x.top+d.outerHeight()+et.globalOffsetY,_=et[M],i[h](r)[h](g)[h](k);switch(et[M]){case g:D=x[r]-E+v,D<0&&(D=x[r],_=r);break;case k:D=x[r]-Math.floor((E-v)/2),D<0?(D=x[r],_=r):D+E>st.width()&&(D=x[r]-E+v,_=g);break;case r:default:D=x[r],D+E>st.width()&&(D=x[r]-E+v,_=g)}i[a](_)}else{d[C](s)==H||d[C](s)==N?(P=et.offsetY,D=-1*u[r]):(P=u.top+et.offsetY,D=0);switch(et[M]){case g:D+=-1*d[y]()[c]()+et[O];break;case k:case r:default:D+=d[y]()[c]()+et[O]}}navigator.userAgent.match(/MSIE ([0-9]+)\./)&&RegExp.$1<8&&(D+=et.IEOffsetX,P+=et.IEOffsetY),i[C](r,D+U)[C]("top",P+U)[C](I,"0.01").show(),B=l,d[C](s)==H||d[C](s)==N?D=-1*u[r]:D=0,i[X]()[r]<0?(D+=d[y]()[c]()-et[O],B=b):i[X]()[r]+E>st.width()&&(D+=-1*d[y]()[c]()-et[O],B=b),B&&i[C](r,D+U),i[W]()[C](I,"1");switch(et.mode){case"zoom":ot=b,d[a](et[t]),i.animate({width:L,height:L},et[w],et.easing,function(){ot=l});break;case"slide":ot=b,d[a](et[t]),i.animate({height:L},et[w],et.easing,function(){ot=l});break;case"fade":ot=b,S&&!et.noOpenerFade?(et[w]=="slow"?B=80:et[w]==$?B=40:B=Math.floor(et[w]/2),d.fadeTo(B,.01,function(){d[a](et[t]),d.fadeTo(et[w],1),i.fadeIn(et[w],function(){ot=l})})):(d[a](et[t]),d.fadeTo(et[w],1),i.fadeIn(et[w],function(){ot=l}));break;case"instant":default:d[a](et[t]),i.show()}return l}).on(f,function(){return i.is(T)?(i[W](),d[h](et[t]),i[q]("."+et[t])[h](et[t]),i[q](j)[W](),l):l}).on(B,function(){return i.is(T)?i[o](f):i[o](x),l}),d[u]()[a](R)[C]("cursor","pointer").on(n,function(e){if(ot)return;e[p](),e[S](),i[o](B)}),et.expandMode==P&&d[P](function(){if(ot)return;ut=window.setTimeout(function(){i[o](x)},et.hoverDelay)},function(){window[m](ut)})}),nt[q]("a")[C]("display","block").on(n,function(t){if(ot)return;e(this).attr("href")[d]<1&&t[p]()}),tt[q]("li")[C]("white-space","nowrap").each(function(){var t=e(this),r=t[D]("a"),s=t[D](j),u=r.attr("href");r.on(n,function(e){u[d]==0||u=="#"?e[p]():e[S]()}),r[d]>0&&s[d]==0&&t.on(n,function(e){if(ot)return;tt[o](i),e[S]()})}),tt[D]("li").each(function(){var t,n,r,i,s=e(this),o=s[D](j);if(o[d]>0){et[V]&&(et.cloneOnDetach&&(t=o.clone(),t.attr("class","")[W]().appendTo(o[y]())),o[V]().appendTo(rt));for(n=et[A],r=1,i=o;i[d]>0;r++)i[C](F,n++),et[_]&&i[a](et[_]+(n-1-et[A])),i=i[q]("> li > ul")}}),st.on("scroll",function(){tt[o](i)}).on("keypress",function(e){!ot&&e.keyCode==27&&(e[p](),tt[o](i))}),it.on(n,function(){ot||tt[o](i)})}})(jQuery); \ No newline at end of file diff --git a/www/js/jquery.min.js b/www/new_webend/js/jquery.min.js similarity index 100% rename from www/js/jquery.min.js rename to www/new_webend/js/jquery.min.js diff --git a/www/js/skel-layers.min.js b/www/new_webend/js/skel-layers.min.js similarity index 99% rename from www/js/skel-layers.min.js rename to www/new_webend/js/skel-layers.min.js index 900b94a..c944741 100644 --- a/www/js/skel-layers.min.js +++ b/www/new_webend/js/skel-layers.min.js @@ -1,2 +1,2 @@ -/* skel-layers.js v1.0.4 | (c) n33 | getskel.com | MIT licensed */ +/* skel-layers.js v1.0.4 | (c) n33 | getskel.com | MIT licensed */ (function(e){typeof define=="function"&&define.amd?define(["jquery","skel"],e):e(jQuery,skel)})(function(e,t){var n="config",r="_skel_layers_translateOrigin",i="cache",s="_skel_layers_translate",o="visibleWrapper",u="_skel_layers_resetForms",f="_skel_layers_resume",l="exclusiveLayer",c="_skel_layers_promote",h="$element",p="_skel_layers_demote",d="moveToVisibleWrapper",v="setTimeout",m="moveToHiddenWrapper",g="right",y="bottom",b="position",w="useActive",E="width",S="css",x=null,T="center",N="_skel_layers_suspend",C="prototype",k="left",L="wrapper",A="skel-layers-layer-z-index",O="_skel_layers_init",M="children",_="skel-layers-moved",D="overflow-x",P="hiddenWrapper",H=!1,B="scrollTop",j="element",F="transform",I="layers",q=".skel-layers-fixed:not(.skel-layers-moved)",R="top",U="height",z="length",W="visible",X="touchstart.lock click.lock scroll.lock",V='
1){for(t=0;t0&&(t[ct](),t[S](E,(t.data(Jt)+r)/12*100+"%"))},e.fn[Ot]=function(){return e(this).parents()[z]>0},e.fn[ct]=function(){var t=e(this);t[Lt]("class").match(/(\s+|^)([0-9]+)u(\s+|$)/)&&t.data(Jt,parseInt(RegExp.$2))},e.fn[c]=function(r){var i,s,o;if(this[z]>1){for(i=0;i-1*f&&t>l;break;case g:a=n-1*f&&t<-1*l;break;case R:a=t-1*f&&n>l;break;case y:a=t-1*f&&n<-1*l}if(a)return s[St]=x,s[xt]=x,s[It](),H}if(i[B]()==0&&n<0||u>o-2&&u0)return H}),this[h]=i},Nn[C][Z]=function(){return this[h]!==x},Nn[C][Yt]=function(){return this[h].is(":visible")},Nn[C][d]=function(){t[i][o][ht](this[h])},Nn[C][m]=function(){if(!this[h][Ot]())return;t[i][P][ht](this[h])},Nn[C].resume=function(r){if(!this[Z]())return;this[h][At](an).each(function(){t.parseResume(e(this))}),this[n][rt]||this[nn](r)},Nn[C].suspend=function(){if(!this[Z]())return;this[h][r](),this[h][At](an).each(function(){t.parseSuspend(e(this))}),this[W]&&this[It]()},t={cache:{visibleWrapper:x,body:x,exclusiveLayer:x,html:x,htmlbody:x,hiddenWrapper:x,layers:{},window:x,wrapper:x},config:{baseZIndex:1e4,layers:{},speed:250,transform:J,transformBreakpoints:x,transformTest:x},eventType:"click touchend",show:function(e){t._[Pt](function(){t[i][I][e][nn]()})},hide:function(e){t._[Pt](function(){t[i][I][e][It]()})},toggle:function(e){t._[Pt](function(){var n=t[i][I][e];n[Yt]()?n[It]():n[nn]()})},getBaseFontSize:function(){return t._.vars.IEVersion<9?16.5:parseFloat(getComputedStyle(t[i][Kt].get(0)).fontSize)},getHalf:function(e){var t=parseInt(e);return typeof e=="string"&&e.charAt(e[z]-1)=="%"?Math.floor(t/2)+"%":Math.floor(t/2)+Qt},lockView:function(e){t[i][wt]._skel_layers_scrollPos=t[i][wt][B](),e==sn&&t[i][on][S](D,rt),t[i][L].on(X,function(e){e[kt](),e[Et](),t[i][l]&&t[i][l][It]()}),t[i][wt].on(mt,function(e){t[i][l]&&t[i][l][It]()}),t._.vars.isMobile||window[v](function(){t[i][wt].on(vt,function(e){t[i][l]&&t[i][l][It]()})},t[n][dt]+50)},parseInit:function(n){var r,s,o=n.get(0),u=n[Lt]("data-action"),a=n[Lt]("data-args"),c,h;u&&a&&(a=a.split(","));switch(u){case"toggleLayer":case"layerToggle":n[S](nt,zt)[S]("cursor","pointer"),r=function(n){n[kt](),n[Et]();if(t[i][l])return t[i][l][It](),H;var r=e(this),s=t[i][I][a[0]];s[Yt]()?s[It]():s[nn]()},n.on(t.eventType,r);break;case"navList":c=e(un+a[0]),r=c[At]("a"),s=[],r.each(function(){var t=e(this),n,r;n=Math.max(0,t.parents("li")[z]-1),r=t[Lt]("href"),s.push(''+t.text()+"")}),s[z]>0&&n[jt]("");break;case"copyText":c=e(un+a[0]),n[jt](c.text());break;case"copyHTML":c=e(un+a[0]),n[jt](c[jt]());break;case"moveElementContents":c=e(un+a[0]),o[f]=function(){c[M]().each(function(){var t=e(this);n[ht](t),t[Bt](_)})},o[N]=function(){n[M]().each(function(){var n=e(this);c[ht](n),n[Wt](_),t.refresh(n)})},o[f]();break;case"moveElement":c=e(un+a[0]),o[f]=function(){e(V+c[Lt]("id")+'" />').insertBefore(c),n[ht](c),c[Bt](_)},o[N]=function(){e(ut+c[Lt]("id")).replaceWith(c),c[Wt](_),t.refresh(c)},o[f]();break;case"moveCell":c=e(un+a[0]),h=e(un+a[1]),o[f]=function(){e(V+c[Lt]("id")+'" />').insertBefore(c),n[ht](c),c[S](E,Ft),h&&h[Ct]()},o[N]=function(){e(ut+c[Lt]("id")).replaceWith(c),c[S](E,""),h&&h[S](E,"")},o[f]();break;default:}},parseResume:function(e){var t=e.get(0);t[f]&&t[f]()},parseSuspend:function(e){var t=e.get(0);t[N]&&t[N]()},recalc:function(e,n){var r=t._.parseMeasurement(e),i;switch(r[1]){case"%":i=Math.floor(n*(r[0]/100));break;case"em":i=t.getBaseFontSize()*r[0];break;default:case Qt:i=r[0]}return i},recalcH:function(n){return t.recalc(n,e(window)[U]())},recalcW:function(n){return t.recalc(n,e(window)[E]())},refresh:function(r){var s;t[n][F]&&(r?s=r.filter(q):s=e(q),s[O]()[Vt](t[i][o]))},unlockView:function(e){e==sn&&t[i][on][S](D,W),t[i][L].off(X),t[i][wt].off(mt),t._.vars.isMobile||t[i][wt].off(vt)},init:function(){n in t[n]&&(t._.extend(t[n],t[n][n]),delete t[n][n]),t._[_t](t[n],function(e){t[n][e]&&typeof t[n][e]==$t&&b in t[n][e]&&(t[n][I][e]=t[n][e],delete t[n][e])}),t[n][ln]&&(t[n][F]=t[n][ln]());if(t[n][F]){if(t._.vars[Mt]=="android"&&t._.vars.deviceVersion<4||t._.vars[Mt]=="wp")t[n][F]=H;t._.vars.IEVersion<10&&(t[n][F]=H),t[n][Ut]&&!t._.hasActive(t._[fn](t[n][Ut]))&&(t[n][F]=H)}t[i][wt]=e(window),t.initTransforms(),t.initObjects(),t._[Pt](function(){t.initLayers(),t.initIncludes(),t._.updateState(),t.refresh()})},initIncludes:function(){e(".skel-layers-include").each(function(){t.parseInit(e(this))})},initLayers:function(){var r,s,o,u=1;t._[_t](t[n][I],function(r){var s;if(!(b in t[n][I][r]))return;if(!t[n][I][r][jt]&&(s=e(un+r))[z]==0)return;o=new Nn(r,t[n][I][r],u++),t[i][I][r]=o,s&&(s[M]()[Vt](o[j]),s.remove())})},initObjects:function(){t._[Pt](function(){t[i][jt]=e(jt),t[i][Kt]=e(Kt),t[i][on]=e("html,body"),t[i][Kt].wrapInner('
'),t[i][L]=e("#skel-layers-wrapper"),t[i][L][S](b,rn)[S](k,"0")[S](g,"0")[S](R,"0")[O](),t[i][P]=e('
')[Vt](t[i][Kt]),t[i][P][S](U,"100%"),t[i][o]=e('
')[Vt](t[i][Kt]),t[i][o][S](b,rn),t._[pt](at,t[i][P][0]),t._[pt]("skel_layers_visibleWrapper",t[i][o][0]),t._[pt]("skel_layers_wrapper",t[i][L][0]),e("[autofocus]").focus()})},initTransforms:function(){if(t[n][F])e.fn[r]=function(){return e(this)[s](0,0)},e.fn[s]=function(t,n){return e(this)[S](F,"translate("+t+"px, "+n+"px)")},e.fn[O]=function(){return e(this)[S]("backface-visibility",rt)[S]("perspective","500")[qt]("transition","transform "+t[n][dt]/1e3+"s ease-in-out")};else{var o,u=[];t[i][wt].resize(function(){if(t[n][dt]!=0){var e=t[n][dt];t[n][dt]=0,window[v](function(){t[n][dt]=e,u=[]},e)}}),e.fn[r]=function(){for(var r=0;r diff --git a/www/old_webend/gfx/logo.png b/www/old_webend/gfx/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..732f0364f5386e026fa1095f1f09d632dd8dfa4c GIT binary patch literal 53434 zcmeFa1yoQ?yFa?=MkGW^DM{(>4(Sx6yQHMMk(3aW5+p>BRFG~&KvGn?yE`TC;9Gp} z_kPE7?)l$)*ImoK6vw@1p4s!8nJ0eFxD8WMkitMEM1>#-8sUcJZW#S!PsVR%m#~$+TzI!-3kvh3@mRLBYj>-PF=vq()@)=hAG-9De9; zL~mW63T$g>ot|S9_D7|(hp>=KO~@S2C}5x?AAWv%@ZI8G2hcLlZM__K#e_EXeAIb zI>f9T8cYkpdqM{76clbyP!fbIxue0qO<#nyNC%KgD&eo9Buu zK0Pj{A*^AtFk`cO5&^3}`?aavE(l7G#RH?=J#*{9Eb8guj4H>}XIN=KydXC+nmwQI z&9@hZplK(czVo|GrG$Qbh<-NbnRhneE%eaRoev|-O0Ef)LFvmQ8oTzF*hpl=R1FW$ z&&>_Vw1{dOc4&B?n>Xt>YMfbr_u)T1+@GqSq4a0f^_PM_nriOalglRVeToufG`0{e zby|UTaZ2))yyc!zl_nkTtTOhaDDmXTUDj;!Fwv*9AMbp*FqxUWdjcmo$pO8!5`^)L zWysYvhC7g@#?o|ZoH>M`of^BQZ#2koeinh#y{;FVLT6IxcOXBrdru!hke)atqgqF) zP#ZD?iKqM1y%izaYr1*25s|nFVXO)5)POTcl(MB+6iXD<#E;m)fVLn&l;&~wTM{}0 zrf$_nACWal z!(&HKl70%sRVJ5><&b7k30EUkmnPW}aDe3r(UGi<9eDwIekhVyx6vF|haEy;A#v z{YCPNtqR5R-8U)h(u5RopGHg`mLT!O-zBAQ51vb%`!L5gM>I#aqm7zsB>d>rk?IVM zN{5vU!93PH`#hp)BCCjcR!i;j2V&#xr9Cqhqp6hZ}@UU^2~GX)P!F7JU9zOeDFc;gQD0g<@9&@v$d_H zXvPGkZga+8J7+*X(jtET%dS^PVR>*UXpBSI(DOt>Y|O&q;k;BTFN}S2O)J)by#&g2Q}x0ya4Zh5o6xNY@&=Ban}ahoQ=e^dOg21IlG(*_qxSn zVsEB1wKJRJoP8;DO~g`kO2kq0o}2t1IUd>ZlQ6Z7ZYzuFeh?PRHhgB7FdYR+l-@M8(a5pp} zOg5mCF+q?qg{XDBy>3p%Y5$S#w8xkI)RfYc=Jnjs;tkFX%Z-q+mtE{HY11CCIez}o zE;gk+-zS9j@)`5P$pRlmF-3p#vPB9eW2RV*!ojx{*{*qqhMV|;2Z9bSX9Z{Zxh7aA z9_V**HCD7&bSi$ZOVbaY6!WFHFuCx!=!0_n?!cJCh53v4Yr~!#d3cdEL<#YZnjVx4 zuZu*cSBc<>L#mS;bf z)nFjeT&OFs;wj;OGjJeGdh1hj8B#p(tf0N%* zWzuW*#cX+Df+0;C^LbvvLIS2O#_-5{jLG}&*Y^)3Mwt@2X+~=T%f+g)8u%+~O>;i= zbn^+Ry;9p#J67Y|_%dE*ICx~+w?X7td%(WdKdN1OcqaI%epDSsUB2I}-}L0(N$H_b zQCQyc(eo1<-9iPMN9%2HU*OJ=C@{+htG@MB@k?iJ|`F zMe7WOy}0|_@*&FP;Vlf_5tm5Mf@!3$w_QlgNtmoelXsFOQ&f{rw2ic@6}trc2396K zPNha~UwgsM|G-^lSM8JK$a28fIP;y}$kb=4-ad@q#|%a@%RLv3dnT=}*=<&1IZc0& zxQJNftL5v_*{O8eDH)x|(Wul&F6Py@S#et7KacyW*jDqRCb_6e=V8@`M_rkx+2Jx# z8duNwUY+~)jf;W)G#-KRx?K;u!;gpilQ+hF9H`HFI%|eqsW%F16>IhPgx5ue#l}PW zg|yGdhBn81tr}g^cl*Yq4iSR`d(UI{qpyh}L?=aeKE`;wn#L{2!!sk~aJGD!Bi3uu zOO=Lyo_XF`gnxs{=cs>mu%|DvFC$?mA+Ev3EBkDvah0HWw6(eQR{bY8HWt0T`zPy7 zu4Aqwn^}|B6z9B1eQ7Q%zQ5a7{hV_WM-Ufx0S}kBduq(aFbYA!RhDX+PMY#^yvBAm zjD{w5My8BzHuk^~g&=+*H+w_lho(-XMyBSLwgTjvH4WsXmL>w^8XWS>^7dk;7M9W; z4yLLe3Tnn44~=5nQ-4+Y3Y zE;}UElvg4ZvvV*dC9V#KOkF!ph6c!^^@! z`ujyLhzd&l4kl*2D&msAcL)9^KyKmWWY5dQF6Zk0!HvVBLCRZQO(`nlu5i;On z{*O@RpWo}x$Nv#VCrh*c@FJH_{$n#!H_QLf?DENP&3>$@-=>-$pw27iU~1@O=b&b1 zXD#^Ka{Vh1192FQhNZ2EovR})Khxi9|FvfR5@afF=wvDg)-(qLGduXD#=^Bb#**Vx4 zItg0Z7@C_h+1r})GyQe*O3fb&m-n8nqm!YnvFSZ=L2!f7($a*N-H?^TjLq1T!O(=$ zl!2R@ot?qRl#7dj#l(c2hnbDj(1_dY2ORS9SDXKvXmLAZ=gYnGyJ!<2n#YKnnT3nn zh=JYIjG2Lhi`|&P(2$j#!PLZr)x^-ukk#0b^AFKin*W<0j>t^;&W*#o^%=C{L{$I?%Uuxz5lNtDH?HXGc+M1i12r~UK zs6TG}zc^{ecD6324*!#_12(83@Ow-h90koB>}*I4?d`2CjSVliA(M-($?uNCpEi%w z$&U1jQvD6`D>D9H9IJ_`gXRBZiC%fjKVc&M|Jj)T*PHUcXV-q4)?b^F^f&$buSV_< z+x+iF@zRk3{($&z3sdrPJ6)>hpW8rS#(*=*dj;@6{E+{y68&5Af7yn=OE>wy>x%sL za#x!FlXScPtvB*pFaIFsuipMZ{tCcX3?KiWN{Uy_)XhoG(EU=W{nh$XQ(sPpsG<44 z-u>gj|I}sqtG^$8DF8hxC<=tBY8W~hTktde)AN6M9Z(lsSKj-FoXeO0ujKrA{&zY5 z>0B6@I~W z6^);kf5G)rh^|)n1=m$Hep>zo*H0n3THzO5SJC)s`4?P2h3IO9UvOPT5t!P7j}W+m zuMIrRt}X>%Dj+qMR*{Dwk2?_L7YIS$FTkJ65ai4ZK`RCj#G42~_;yeAKT1MSFzG#U z5jD4wHE&lh-1&oZck^FH3Bhm_RbIuw(;G2Oteqq`wo z89q}6Wu{Bx$7HI#$q=^^74;aWOtCKSscjI#bl)VD9>T?{Z*V`~!ueq4vXGjz_~I~r z5leeZdg5`5U$ogcTvH?S!$3*@dSKMJum@IMOex&fC3hlI<@DA-l9 z|5dBsD@)HY{;2$uR)6c_KeYPEi@k?2;o2Kcc>X+1(3_WyZMQiX?arM$^YioIr>Uta zXG*ti1)N{E+3s1bR^fnEnPgU<39E#pWckBEMk=b;j*C6IH7*<}-CP~&sxl~K4~B=S z0;k)`9%>ZnsJ}=s&!<7cfxaydh-aYer_&P#3DZJKutC_Op&D59y6?LX@D#XL1IVve z=U^`NRrtR2@m76W^HE%Cm%sNBamgu0%l`N8-}CPmj#N9Zf?rx&i>?#yi@L7k`$NXj z_cj~A^0<(B!Q*H)UhQ1tvaVI*ViV{azL1ecNUjcgRFGt6{oEn^A@C_20uq#d>NxaC zw&_lQ7!(4j>%Fbc7?UquovMV}3BK^Y3+4liWUTVh+425KCsV`ga?aVgH_zxb&g;Fk zdtxcJQI{SDnADMT`X$c=ghLP>3K=OZ0t5?@!@xrE*i(K=5SD}yP8ENSect1Zd_QAM z8vLn+SXZH=_789;hiruC?K{M6x{G%&y16Fr>eqXHeJy{~z%QIf$crG#$ANM`Km?KS zmfGos;AV!>Dnbf=$9T+Qy6?9}JIpN=$j^4Xdfa8yX0z@vtpygW_lDO)b)JWL>iI6~ zBhE{oGa?pIKa0VPzyB;Emif)#KKtCpK;uI28ZWoDtZ#l$+(bkJF{?>?<)c|D`Q*I> zYgJ5Q!PDUceUi}&&*fMOE+WIXDA@07B@pOf1B7)lmtd5k0Is+1YNR1#NJUC?3?5~Wqlz!J$9;FfX6UWqV3F=o z3iqwYH#2I|T5?6Y^&=c<9GWw%j*SWCz*hhR5iyckO*@9(85eh-DAEepQ=YB+Hq^|v z;f=!?h$9Pq7B*5N&o;o%jl&j!-)rl8ue*I7dmOC{!N$X)kcxkRvwzhEcVaWs>ID|u zj4IOk+4n^|B35ovQempNN5pNrr~AU&FTD?jHT1p9>?Q>vY4xUdtS`E*kIV-M=Xj<@ zVXKERA?8OjEgvKBC+(+cQLt^%9bBt)E{+Eq28wh&H^z7%>8DL3Hq;*P#|>1^jmxP5yK_(`6a!JPmpEGzh# zj3A15xX1=9O6w>%0!Y#CWcOa*@dYaRK5S_GXAh=x@;=p=>&R2W-GQoeibJ1zKc*Gp zVez>wjUP_>9+FffMM@^gweFtkOK(4T@IW<3LASw2076%53POH*bEsAST?O_;R~93x zaa$DFwzL~sls*Zhv7RZ08)H>3y>>ngmzu*Eyt*L?Uvc(uOjL-_K>toxXO1a3B^8y= z$$G_jjcWtp=0y{Ql+X*l&8?@!8_dmxhB3KuFiIh$9`IYRWI+R}oUw4~4(T(Yk#ML} zuUe+F^+aCnk>?nHM4uKG3Ds()=aE6)SDL|Xq}4mUi6BZ78q^`Kz=+e&-|pZ0E~4RC z7?G^Vvt&-gFSD+bETY*epXPTOf@T(bUta8VG7a|kf85z}!oAn0U&vHF&&;nkEW}Ot@X5_|^q|R=T=yF7^m*Mja;a(syPAd*bWjD?2LGc(hpjg3!Fb1xj&@ zYQD6~4R@iA;0@!pI-Xtq>1jimY!#|FvQ=HU@SJ$Tz0YD`V<7lRb=<RMwsMi6lni z_m1MFx%;4G4(zKB48ISHMheKFNFO~_X;D&$SytI~sGUE0`Y#g9&gv`}Nc_ld{B zTG*y9J?+%z*sS7Op3(B@wuUx`I&|@LCHhdkmq#c{pSQ4RX4m3-i}%gc!bj=JvM>uE zaUAJy9>#8(;^G!+HSJ5eH1g^9Uo}QdZC6IfhC4FO&Clb< zr4hI<6msf{dTc8OM^-yJWE5WT)|pS9N6xmbhDWS~qZy%~zi(VOEYai`8h;-JizUO| zfucr9?3Ww6?R@LI>z$s|dZD8QO+I_A3yi&)V^7Wy5m;S?&)6*I`dtY4q z%sJi6L0Y9)y;@w<7Xg8gj6(HPp&Zjaf~{Txro)wf3Q|(2xVk%Q3l9&^b<+EAW4uOH zotYvEUT=3}8HZ!*)P1DJb@R5*kx0&07M}zQ(aUi)0)t%!?3A*H8}9<5RY`>4Q52tN^abNH^Sd~pB%h;MOk=1BKYFzF5|Q$`~{dn{S&)XV9){( z(6CLn9Ef8lEuvy01DO%NXA{!V(QVXh3KmdqPr5h6Byi1dw`E1!U6|L(b)z}ox}PoW zCJN`4d%f~@M6jzvW$Fv}y*O3DG`_>8?L($R>3*&f{q{6fR*p7{{p#2@*0LuEe7Y`&t8^cJkMQQyKzCh%dtaR%A z^ZK{A@vuyy!jYvE%(o8*zD~A;;b;_S#!?18APIe)Ey#y(lo8X@i9n)g1e<)eNDPyY zroc_c$jC@WCX%5f9ZP`1#dr>DR+yJ}d^8&kGxgmfbHT1%ebv&>jer=qjun$Wj@-nz zqNT9leGi0@qKK1@8jt3L%IiL-B?PuHU||YVio+{mWiFVWSed9Qpj_-fel2*ucQ9Gr zeKK{XkjmR($||#r7tIv+NnCl)qfW0_gQ|vAL`4RrjhgCC-Qk8dpQ|;|Mb{)(2gU8q zbfR!>J;``h(*6CtTmGeJ&2<@D>;i`$Lmba*Oe}#{ZDUjTbs31sq$zi}sBl{TQe1y5 zBRkc9bYH^wK3<<<2kBR|(w*glo#(_EfsesAc0D}g*Kp>dpn#bjKU=w&=3_OS5Fwzek|waMrz%Hl4+Bp_))=NI^H5;o zgki!Q*ZrmMQB!e^%Y(xEP7c}&4VxontD|-e{n&2ICF-q$b%Z@`O-ApW)<^m+*e4u& z1*WH`wO6NJ)P28kO&BYvx|%nk^G>iSrF5Dno1PhT^SVRX*nt((nxnr=wv4RoR||I3 z-~bgZb#-Up>AiUIf@}9pH=1kN$BKt;q!0%OM}L1mVxUM?U#=P*an_^dkdQI{H6IFh zcA1SGH(g=wDSuQ4g1+`6Q-tO&{&#~672d3isd}{IFn%gl6{9%{smHU?LLU6Lpre@x zrfQe8+W!-OJPNML}()K*}NsuKx!_I zzE$yOmFR9+cUV2t`xS2HF}1I`F9HuI*p~J`>DJ7svr!NFUXb9qzC=gxUQKJUna71j zD(s5CE_a!gel%L1Y`BOPIT{ z1I0goK66g;VCqZsxXWNJBWf?&HtVygGSw*&N?|x|1x9N9IS=#2u&mqO*85MHZkFPR z&N=WPdTk@qYZRUC59*&8x=3y?Cgh`Jw)yfp%(VlH;Z>DbeEW+y46o}(?OsIhEzgxC zI~hZt@`S~Ct+Y^bC0Mp`jL&_1<1yULlwy8qe86YP_MUxUZSpao1lQ{_E?1ll z!S8c8`TZk%-@&(*TUuJ8?ve1htR*HUetv&)7r7bqq^hSErE?n(kHc}HD<%f3{Che? zMwWp#@se#no8aZM@J-Wd(^_(2N#Qwea$bMOnk5_-FQiErN)GHJ)+3jW$1)@3rN3?XA+;K9Qr>4txj zj%h#Z;I^Lv-}25UI`hkM-i#HV#wUV=y}WAsEYML@wzNdj_o3G_lz-IWmM|)jnJV0swhK{Xb0;6ssk=*Rr!s&UBmfG2DZm8e zq>GKQf`Wn) zyUmDsX)J4GW7@}=US(&)G(N`Gnumex!|i)8^TU_od_PmOS(fF{=1kmv@m3iEOQSJ? zSb#h3Q;QFCO1FrJNF=6KAT~ZEtfYiRQG%#*a4xmWtF+kSLbrkk4`%C{6f83Bqt3~i zDU#imxkIxCL*|<_*@EK7)cAbt?0doZdX4-Hmx=~loR4Ij$;CTc9+BygDw3qV?$UVh zfMC_(iv@cel{_jM+QXS$)T)`_94evhuF?xy>OoqA=&NQ5DWAUA#f~ z@9fMmkmOdU*D&T{OvJCjZ4;}KcRwEv7FOv@GDFE}A|*oB40a0W&yEX?mf!q(Pzcc&6@LW=7o zvqZkcmK_JzO{GIv*w_xkzJ+;3dNtO|h2`jIi)HTq6pdl=Sg~=Ao95N*JbAyc!h3D6sXo|7?)lmtjKSYa<=BBdM!L}<#MJ6`6_%6)P^Bt*pIZZkfFn%m{IT^N%Zu#nT{ zgl>kC!F==&I^ht_tdvJUz#CZj>({U2UJ~=Pv?vtU>TqMyE&H1~$L+`9cvBh4$zjL2 z;z`>U2wx!6#eI^Ik%7|p!vj4F{c7N;?#{}>TzJiwz1N%Do#k*vP|m?_zvBve24kP^}uYazA0jE3xY-V5l?(3V=5}z+;F~M3{P)B%cPZ_SE$QY1e2b@8-;aH9~&fvfvudUUgco=(&L^>RlN z;Cw{9YlP{q7r;Zg1qIeqk8ng`VPT=hRjH=Va8Wv_rL8SRj;c&+d}=y2QM4H&&*YcT6@LW$z8^QW5UZ-}m(tUNkvG$6a z&u$GZ1~fJ{E-hKKQWXg8?j@BzIB^l2)FVT+g+UH4MWXxEM7U$ga@cBa_v&C%_D#db zDFM%eHNa4h@16fYL`SR`^*-LSWJ9Xc5+K_(z(ep$ zOuQM{nA>j^EZSt!cKxN#F)g&m_Wq#8r|?MM{`r%1F&`v9jq`mgneA=LY|X_xL4Lxy z$vI_e+tUQDGu;)Dx7nUQG<#mu{Q(vubThn-daFTE&TGj(HfuvqlQhj?hprhegM507 zyuZ`XHGI;Sn$Cr`^5xb@!oAu z-teG7;p)(&Ed!vhl5y_p z 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 N;OXk;vd$@?2>`dbA*=uZ literal 0 HcmV?d00001 diff --git a/www/old_webend/index.php b/www/old_webend/index.php new file mode 100644 index 0000000..aeaa785 --- /dev/null +++ b/www/old_webend/index.php @@ -0,0 +1,46 @@ + + + + + + +BOSWatch + + + + +
+ + BOSWatch
+ [�bersicht] - [Parser] + +

+ +
+ + + diff --git a/www/old_webend/mysql.class.php b/www/old_webend/mysql.class.php new file mode 100644 index 0000000..69d5fbd --- /dev/null +++ b/www/old_webend/mysql.class.php @@ -0,0 +1,134 @@ +show_error = $show_error; + @$this->conn = mysql_connect($host, $user, $password); + if ($this->conn == false) + { + $this->error("Keine Verbindung zum Datenbank Server!", mysql_error()); + return false; + } + + if (!@mysql_select_db($database, $this->conn)) + { + $this->error("Datenbank nicht gefunden!", mysql_error()); + return false; + } + return true; + } + + /** + * Database::query() + * + * F�hrt einen MySQL Query aus + * + * @param mixed $query Auszuf�hrender Query + * @return Result-Handler/FALSE + */ + function query($query) + { + $this->result = @mysql_query($query, $this->conn); + if ($this->result == false) + { + $this->error("Fehlerhafte Datenbank Anfrage!", mysql_error()); + return false; + } + return $this->result; + } + + /** + * Database::fetchAssoc() + * + * Liefert alle gefundnen Datens�tze als Assoc + * + * @param mixed $result Externer Result-Handler + * @return gefundene Datens�tze als Assoc + */ + function fetchAssoc($result = null) + { + if ($result != null) + { + return @mysql_fetch_assoc($result); + } else + { + return @mysql_fetch_assoc($this->result); + } + } + + /** + * Database::count() + * + * Z�hlt alle gefundenen Datens�tze + * + * @param mixed $result Externer Result-Handler + * @return Anzahl gefundener Datens�tze + */ + function count($result = null) + { + if ($result != null) + { + return @mysql_num_rows($result); + } else + { + return @mysql_num_rows($this->result); + } + } + + /** + * Database::closeConnection() + * + * Schlie�t die bestehende MySQL Verbindung + * + * @return TRUE/FALSE + */ + function closeConnection() + { + if (!@mysql_close($this->conn)) + { + $this->error("Verbindung zur Datenbank konnte nicht getrennt werden!", mysql_error()); + return false; + } + return true; + } + + /** + * Database::error() + * + * Gibt eine Interne Fehlermeldung aus + * + * @param mixed $error_msg Text der Fehlermeldung + * @param mixed $sql_err MySQL Fehlermeldung per mysql_error() + * @return NULL + */ + private function error($error_msg, $sql_err) + { + if ($this->show_error) + { + echo "
MySQL Error: $error_msg
$sql_err"; + return true; + //exit(); + } + } + +} ?> diff --git a/www/old_webend/parser.php b/www/old_webend/parser.php new file mode 100644 index 0000000..37bb708 --- /dev/null +++ b/www/old_webend/parser.php @@ -0,0 +1,111 @@ + "Unbekannt", + "1" => "Polizei", + "2" => "Bundesgrenzschutz", + "3" => "Bundeskriminalamt", + "4" => "Katastrophenschutz", + "5" => "Zoll", + "6" => "Feuerwehr", + "7" => "Technisches Hilfswerk", + "8" => "Arbeiter-Samariter-Bund", + "9" => "Deutsches Rotes Kreuz", + "a" => "Johanniter-Unfall-Hilfe", + "b" => "Malteser-Hilfsdienst", + "c" => "Deutsche Lebensrettungsgesellschaft", + "d" => "Rettungsdienst", + "e" => "Zivilschutz", + "f" => "Fernwirktelegramm", + ); + + //Data for Country Parsing + $country = array( + "0" => "Sachsen", + "1" => "Bund", + "2" => "Baden-Württemberg", + "3" => "Bayern I", + "4" => "Berlin", + "5" => "Bremen", + "6" => "Hamburg", + "7" => "Hessen", + "8" => "Niedersachsen", + "9" => "Nordrhein-Westfalen", + "a" => "Rheinland-Pflaz", + "b" => "Schleswig-Holstein", + "c" => "Saarland", + "d" => "Bayern II", + "e" => "Meck-Pom/Sachsen-Anhalt", + "f" => "Brandenburg/Thüringen", + ); + + + //Data for ZVEI Parsing + $zvei = array( + "12345" => "testZvei", + "23456" => "testZvei", + "34567" => "testZvei", + ); + + + switch ($mode) { + //Parse Service + case "service": + $data = substr($data,0,1); + if (array_key_exists($data, $service)) + { + return $service[$data]; + }else + { + return $data; + } + break; + + //Parse Country + case "country": + $data = substr($data,1,1); + if (array_key_exists($data, $country)) + { + return $country[$data]; + }else + { + return $data; + } + break; + + //Parse direction + case "direction": + if (substr($data,9,1) == 1) + { + return "L->F"; + }elseif (substr($data,9,1) == 0) + { + return "F->L"; + }else + { + return "ERR!"; + } + break; + + //Parse Zvei + case "zvei": + if (array_key_exists($data, $zvei)) + { + return $data ." - ". $zvei[$data]; + }else + { + return $data; + } + break; + + default: + return "Parser: mode error!"; + } + } + +?> \ No newline at end of file diff --git a/www/old_webend/tpl/content.overview.php b/www/old_webend/tpl/content.overview.php new file mode 100644 index 0000000..dd09404 --- /dev/null +++ b/www/old_webend/tpl/content.overview.php @@ -0,0 +1,27 @@ +query("SELECT id, time, fms, status, direction, tsi FROM ".$tableFMS." ORDER BY id DESC LIMIT 50"); + $Rows = array(); + while ($daten = $db->fetchAssoc()) + { + $Rows[] = $daten; + } + $tpl['fms'] = $Rows; + + //read ZVEI + $db->query("SELECT id, time, zvei FROM ".$tableZVEI." ORDER BY id DESC LIMIT 50"); + $Rows = array(); + while ($daten = $db->fetchAssoc()) + { + $Rows[] = $daten; + } + $tpl['zvei'] = $Rows; + //read POCSAG + $db->query("SELECT id, time, ric, funktion, text FROM ".$tablePOC." ORDER BY id DESC LIMIT 50"); + $Rows = array(); + while ($daten = $db->fetchAssoc()) + { + $Rows[] = $daten; + } + $tpl['poc'] = $Rows; +?> diff --git a/www/old_webend/tpl/content.parser.php b/www/old_webend/tpl/content.parser.php new file mode 100644 index 0000000..62a2de0 --- /dev/null +++ b/www/old_webend/tpl/content.parser.php @@ -0,0 +1,3 @@ + diff --git a/www/old_webend/tpl/template.overview.php b/www/old_webend/tpl/template.overview.php new file mode 100644 index 0000000..fa4e3e6 --- /dev/null +++ b/www/old_webend/tpl/template.overview.php @@ -0,0 +1,84 @@ +Last alarms for FMS and ZVEI (max. 50)

+ +
+ Last FMS alarms + + + + + + + + + + "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> +
IDDatum - ZeitFMSStat.Richt.TKI
". $fms['id'] . "". $time . "". $fms['fms'] . "". $fms['status'] . "". $fms['direction'] . "". $fms['tsi'] . "
+
+ Last POCSAG alarms + + + + + + + + + "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> +
IDDatum - ZeitRICFunktionText
". $poc['id'] . "". $time . "". $poc['ric'] . "". $poc['funktion'] . "". $poc['text'] . "
+
+ +
+ Last ZVEI alarms + + + + + + + "; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> +
IDDatum - ZeitSchleife
". $zvei['id'] . "". $time . "". $zvei['zvei'] . "
+
diff --git a/www/old_webend/tpl/template.parser.php b/www/old_webend/tpl/template.parser.php new file mode 100644 index 0000000..e69de29 From 1e18c2ed67a3e61cc1e3edf7da38fa24dd9c82a1 Mon Sep 17 00:00:00 2001 From: Schrolli Date: Tue, 14 Jul 2015 10:23:43 +0200 Subject: [PATCH 4/8] edit the old webend - insert all new fields from the database - own page for each function - overview for last 50 alarm of all function in one --- www/old_webend/gfx/lupe.png | Bin 0 -> 478 bytes www/old_webend/index.php | 29 ++++++- www/old_webend/style.css | 42 ++++++++++ www/old_webend/tpl/content.fms.php | 10 +++ www/old_webend/tpl/content.overview.php | 34 +++----- www/old_webend/tpl/content.pocsag.php | 10 +++ www/old_webend/tpl/content.zvei.php | 10 +++ www/old_webend/tpl/template.fms.php | 30 +++++++ www/old_webend/tpl/template.overview.php | 98 +++++------------------ www/old_webend/tpl/template.parser.php | 1 + www/old_webend/tpl/template.pocsag.php | 30 +++++++ www/old_webend/tpl/template.zvei.php | 24 ++++++ 12 files changed, 214 insertions(+), 104 deletions(-) create mode 100644 www/old_webend/gfx/lupe.png create mode 100644 www/old_webend/style.css create mode 100644 www/old_webend/tpl/content.fms.php create mode 100644 www/old_webend/tpl/content.pocsag.php create mode 100644 www/old_webend/tpl/content.zvei.php create mode 100644 www/old_webend/tpl/template.fms.php create mode 100644 www/old_webend/tpl/template.pocsag.php create mode 100644 www/old_webend/tpl/template.zvei.php diff --git a/www/old_webend/gfx/lupe.png b/www/old_webend/gfx/lupe.png new file mode 100644 index 0000000000000000000000000000000000000000..60b51cd5d92d25c1351e7a9c989563f97f128e85 GIT binary patch literal 478 zcmV<40U`d0P)``qoA1n^5hXGU#|=2b9HJ}QpD=4+7eTvre~w-Q%Lz&y;$Hy<08d9@ UHgHG(3jhEB07*qoM6N<$f&?|kfB*mh literal 0 HcmV?d00001 diff --git a/www/old_webend/index.php b/www/old_webend/index.php index aeaa785..737d621 100644 --- a/www/old_webend/index.php +++ b/www/old_webend/index.php @@ -11,14 +11,22 @@ $db = new Database($dbhost, $dbuser, $dbpassword, $database, 1); //Show Error = BOSWatch - + +
BOSWatch
- [�bersicht] - [Parser] + +

+ + diff --git a/www/old_webend/style.css b/www/old_webend/style.css new file mode 100644 index 0000000..fd88f4c --- /dev/null +++ b/www/old_webend/style.css @@ -0,0 +1,42 @@ +/*navigation*/ +#navi{ + width: 400px; + margin: auto; + border: 1px solid black; + padding: 5px; + font-weight: bold; +} + +#navi a:link { color: red; text-decoration: none;} +#navi a:visited { color: red; } +#navi a:hover { color: black; } +#navi a:active { color: black; } + + +/*table center and border in*/ +table { margin: auto; border-collapse: collapse; } + +/*Tabellen mit Rahmen*/ +table, th, td { border: 1px solid black; } + +/*alternating line color in table*/ +/*without first line (header)*/ +tr:nth-child(2n+2) { background: #FFF; } +tr:nth-child(2n+3) { background: #CCC; } + +/*table head*/ +.tableHead{ + color: white; + background-color: #BE2F01; + font-weight: bold; +} + + +/*footer*/ +#footer{ + margin-top: 50px; + margin-bottom: 25px; + text-align: center; + color: gray; +} +#footer a{ color: gray; } diff --git a/www/old_webend/tpl/content.fms.php b/www/old_webend/tpl/content.fms.php new file mode 100644 index 0000000..541cb21 --- /dev/null +++ b/www/old_webend/tpl/content.fms.php @@ -0,0 +1,10 @@ +query("SELECT id, time, fms, status, direction, directionText, tsi, description FROM ".$tableFMS." ORDER BY id DESC"); + $Rows = array(); + while ($daten = $db->fetchAssoc()) + { + $Rows[] = $daten; + } + $tpl['fms'] = $Rows; +?> diff --git a/www/old_webend/tpl/content.overview.php b/www/old_webend/tpl/content.overview.php index dd09404..0818017 100644 --- a/www/old_webend/tpl/content.overview.php +++ b/www/old_webend/tpl/content.overview.php @@ -1,27 +1,11 @@ query("SELECT id, time, fms, status, direction, tsi FROM ".$tableFMS." ORDER BY id DESC LIMIT 50"); - $Rows = array(); - while ($daten = $db->fetchAssoc()) - { - $Rows[] = $daten; - } - $tpl['fms'] = $Rows; - //read ZVEI - $db->query("SELECT id, time, zvei FROM ".$tableZVEI." ORDER BY id DESC LIMIT 50"); - $Rows = array(); - while ($daten = $db->fetchAssoc()) - { - $Rows[] = $daten; - } - $tpl['zvei'] = $Rows; - //read POCSAG - $db->query("SELECT id, time, ric, funktion, text FROM ".$tablePOC." ORDER BY id DESC LIMIT 50"); - $Rows = array(); - while ($daten = $db->fetchAssoc()) - { - $Rows[] = $daten; - } - $tpl['poc'] = $Rows; -?> + +//read all +$db->query("SELECT id, time, fms as data, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, ric as data, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC"); +$Rows = array(); +while ($daten = $db->fetchAssoc()) +{ + $Rows[] = $daten; +} +$tpl['lastAla'] = $Rows; diff --git a/www/old_webend/tpl/content.pocsag.php b/www/old_webend/tpl/content.pocsag.php new file mode 100644 index 0000000..5e0138c --- /dev/null +++ b/www/old_webend/tpl/content.pocsag.php @@ -0,0 +1,10 @@ +query("SELECT id, time, ric, function, functionChar, bitrate, msg, description FROM ".$tablePOC." ORDER BY id DESC"); + $Rows = array(); + while ($daten = $db->fetchAssoc()) + { + $Rows[] = $daten; + } + $tpl['poc'] = $Rows; +?> diff --git a/www/old_webend/tpl/content.zvei.php b/www/old_webend/tpl/content.zvei.php new file mode 100644 index 0000000..2cb5042 --- /dev/null +++ b/www/old_webend/tpl/content.zvei.php @@ -0,0 +1,10 @@ +query("SELECT id, time, zvei, description FROM ".$tableZVEI." ORDER BY id DESC"); + $Rows = array(); + while ($daten = $db->fetchAssoc()) + { + $Rows[] = $daten; + } + $tpl['zvei'] = $Rows; +?> diff --git a/www/old_webend/tpl/template.fms.php b/www/old_webend/tpl/template.fms.php new file mode 100644 index 0000000..61ca296 --- /dev/null +++ b/www/old_webend/tpl/template.fms.php @@ -0,0 +1,30 @@ +Last FMS alarms + + + + + + + + + + + "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> +
IDDatum - ZeitFMSStat.Richt.TKIBeschreibung
". $fms['id'] . "". $time . "". $fms['fms'] . "". $fms['status'] . "". $fms['direction'] . " = " . $fms['directionText'] . "". $fms['tsi'] . "". $fms['description'] . "
diff --git a/www/old_webend/tpl/template.overview.php b/www/old_webend/tpl/template.overview.php index fa4e3e6..544bae5 100644 --- a/www/old_webend/tpl/template.overview.php +++ b/www/old_webend/tpl/template.overview.php @@ -1,84 +1,28 @@ -Last alarms for FMS and ZVEI (max. 50)

- -
- Last FMS alarms - - +
+ Last 50 alarms +
+ - - - - + + + - "; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
ID Datum - ZeitFMSStat.Richt.TKITypDaten
". $fms['id'] . "". $time . "". $fms['fms'] . "". $fms['status'] . "". $fms['direction'] . "". $fms['tsi'] . "
-
- Last POCSAG alarms - - - - - - - - - "; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> -
IDDatum - ZeitRICFunktionText
". $poc['id'] . "". $time . "". $poc['ric'] . "". $poc['funktion'] . "". $poc['text'] . "
-
- -
- Last ZVEI alarms - - - - - - - "; - echo ""; - echo ""; - echo ""; - echo ""; - } - ?> + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?>
IDDatum - ZeitSchleife
". $zvei['id'] . "". $time . "". $zvei['zvei'] . "
". $lastAla['id'] . "". $time . "". $lastAla['typ'] . "". $lastAla['data'] . "show
diff --git a/www/old_webend/tpl/template.parser.php b/www/old_webend/tpl/template.parser.php index e69de29..2e9b6fa 100644 --- a/www/old_webend/tpl/template.parser.php +++ b/www/old_webend/tpl/template.parser.php @@ -0,0 +1 @@ +no function yet! diff --git a/www/old_webend/tpl/template.pocsag.php b/www/old_webend/tpl/template.pocsag.php new file mode 100644 index 0000000..66277ce --- /dev/null +++ b/www/old_webend/tpl/template.pocsag.php @@ -0,0 +1,30 @@ +Last POCSAG alarms + + + + + + + + + + + "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> +
IDDatum - ZeitRICFunktionBitrateNachrichtBeschreibung
". $poc['id'] . "". $time . "". $poc['ric'] . "". $poc['function'] . " = " . $poc['functionChar'] . "". $poc['bitrate'] . "". $poc['msg'] . "". $poc['description'] . "
diff --git a/www/old_webend/tpl/template.zvei.php b/www/old_webend/tpl/template.zvei.php new file mode 100644 index 0000000..2484f28 --- /dev/null +++ b/www/old_webend/tpl/template.zvei.php @@ -0,0 +1,24 @@ +Last ZVEI alarms + + + + + + + + "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + ?> +
IDDatum - ZeitSchleifeBeschreibung
". $zvei['id'] . "". $time . "". $zvei['zvei'] . "". $zvei['description'] . "
From 975850590402312476e36850f763c83a35f67bc4 Mon Sep 17 00:00:00 2001 From: Schrolli Date: Tue, 14 Jul 2015 10:31:26 +0200 Subject: [PATCH 5/8] little changes in old_webend --- www/old_webend/tpl/content.overview.php | 2 +- www/old_webend/tpl/template.fms.php | 2 +- www/old_webend/tpl/template.overview.php | 2 +- www/old_webend/tpl/template.pocsag.php | 2 +- www/old_webend/tpl/template.zvei.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/old_webend/tpl/content.overview.php b/www/old_webend/tpl/content.overview.php index 0818017..ad768c7 100644 --- a/www/old_webend/tpl/content.overview.php +++ b/www/old_webend/tpl/content.overview.php @@ -2,7 +2,7 @@ //read all -$db->query("SELECT id, time, fms as data, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, ric as data, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC"); +$db->query("SELECT id, time, fms as data, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, ric as data, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC LIMIT 25"); $Rows = array(); while ($daten = $db->fetchAssoc()) { diff --git a/www/old_webend/tpl/template.fms.php b/www/old_webend/tpl/template.fms.php index 61ca296..5342236 100644 --- a/www/old_webend/tpl/template.fms.php +++ b/www/old_webend/tpl/template.fms.php @@ -1,4 +1,4 @@ -Last FMS alarms +Last FMS data diff --git a/www/old_webend/tpl/template.overview.php b/www/old_webend/tpl/template.overview.php index 544bae5..37ceb67 100644 --- a/www/old_webend/tpl/template.overview.php +++ b/www/old_webend/tpl/template.overview.php @@ -1,5 +1,5 @@
- Last 50 alarms + Last data (max. 25)
ID
diff --git a/www/old_webend/tpl/template.pocsag.php b/www/old_webend/tpl/template.pocsag.php index 66277ce..6b68449 100644 --- a/www/old_webend/tpl/template.pocsag.php +++ b/www/old_webend/tpl/template.pocsag.php @@ -1,4 +1,4 @@ -Last POCSAG alarms +Last POCSAG data
ID
diff --git a/www/old_webend/tpl/template.zvei.php b/www/old_webend/tpl/template.zvei.php index 2484f28..b8b40a1 100644 --- a/www/old_webend/tpl/template.zvei.php +++ b/www/old_webend/tpl/template.zvei.php @@ -1,4 +1,4 @@ -Last ZVEI alarms +Last ZVEI data
ID
From 87c1e9c30734461742a10af037201e027e67ff1f Mon Sep 17 00:00:00 2001 From: Schrolli Date: Tue, 14 Jul 2015 11:01:15 +0200 Subject: [PATCH 6/8] edit in old_webend - more information in overview page with the mysql concat() method --- www/old_webend/tpl/content.overview.php | 2 +- www/old_webend/tpl/template.overview.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/www/old_webend/tpl/content.overview.php b/www/old_webend/tpl/content.overview.php index ad768c7..88a5f8c 100644 --- a/www/old_webend/tpl/content.overview.php +++ b/www/old_webend/tpl/content.overview.php @@ -2,7 +2,7 @@ //read all -$db->query("SELECT id, time, fms as data, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, ric as data, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC LIMIT 25"); +$db->query("SELECT id, time, concat(fms, ' Stat:', status, ' Dir:', directionText) as data, description, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, description, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, concat(ric, ' ', functionChar) as data, description, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC LIMIT 25"); $Rows = array(); while ($daten = $db->fetchAssoc()) { diff --git a/www/old_webend/tpl/template.overview.php b/www/old_webend/tpl/template.overview.php index 37ceb67..68b0f5b 100644 --- a/www/old_webend/tpl/template.overview.php +++ b/www/old_webend/tpl/template.overview.php @@ -1,11 +1,12 @@
Last data (max. 25) -
ID
+
+ ". $time . ""; echo ""; echo ""; + echo ""; echo ""; echo ""; } From 19aa6b21363dd18511c70691e5e68f72566b2565 Mon Sep 17 00:00:00 2001 From: Schrolli Date: Tue, 14 Jul 2015 11:31:18 +0200 Subject: [PATCH 7/8] edit in webends #62: - rename folder in enhanced_webend (new) and simple_webend (old) - little changes in simple_webend overview page --- www/{new_webend => enhanched_webend}/Alarm.php | 0 www/{new_webend => enhanched_webend}/LICENSE.txt | 0 www/{new_webend => enhanched_webend}/config.php | 0 .../css/font-awesome.min.css | 0 www/{new_webend => enhanched_webend}/css/ie/PIE.htc | 0 .../css/ie/backgroundsize.min.htc | 0 .../css/ie/html5shiv.js | 0 www/{new_webend => enhanched_webend}/css/ie/v8.css | 0 .../css/images/overlay.png | Bin .../css/images/shadow.png | Bin www/{new_webend => enhanched_webend}/css/skel.css | 0 .../css/style-1000px.css | 0 .../css/style-desktop.css | 0 .../css/style-mobile.css | 0 www/{new_webend => enhanched_webend}/css/style.css | 0 .../css/usermod.css | 0 www/{new_webend => enhanched_webend}/eintragen.html | 0 www/{new_webend => enhanched_webend}/eintragen.php | 0 .../fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin www/{new_webend => enhanched_webend}/gfx/logo.png | Bin .../images/banner.jpg | Bin .../images/pic01.jpg | Bin .../images/pic02.jpg | Bin .../images/pic03.jpg | Bin .../images/pic04.jpg | Bin .../images/pic05.jpg | Bin .../images/pic06.jpg | Bin .../images/pic07.jpg | Bin .../images/pic08.jpg | Bin .../images/pic09.jpg | Bin .../images/pic10.jpg | Bin www/{new_webend => enhanched_webend}/index.php | 0 www/{new_webend => enhanched_webend}/js/init.js | 0 .../js/jquery.dropotron.min.js | 0 .../js/jquery.min.js | 0 .../js/skel-layers.min.js | 0 www/{new_webend => enhanched_webend}/js/skel.min.js | 0 www/{new_webend => enhanched_webend}/login.php | 0 www/{new_webend => enhanched_webend}/prefs.php | 0 www/{new_webend => enhanched_webend}/show_fms.php | 0 .../show_pocsag.php | 0 www/{new_webend => enhanched_webend}/show_zvei.php | 0 .../tpl/a_footer.php | 0 .../tpl/a_header.php | 0 .../tpl/content.overview.php | 0 .../tpl/content.parser.php | 0 www/{new_webend => enhanched_webend}/tpl/fms.php | 0 .../tpl/mysql.class.php | 0 www/{new_webend => enhanched_webend}/tpl/parser.php | 0 www/{new_webend => enhanched_webend}/tpl/pocsag.php | 0 .../tpl/template.overview.php | 0 .../tpl/template.parser.php | 0 www/{new_webend => enhanched_webend}/tpl/zvei.php | 0 .../tpl_old/content.overview.php | 0 .../tpl_old/content.parser.php | 0 .../tpl_old/template.overview.php | 0 .../tpl_old/template.overview.php+ | 0 .../tpl_old/template.overview.php.temp | 0 .../tpl_old/template.parser.php | 0 www/old_webend/tpl/content.overview.php | 11 ----------- www/{old_webend => simple_webend}/config.php | 0 www/{old_webend => simple_webend}/gfx/logo.png | Bin www/{old_webend => simple_webend}/gfx/lupe.png | Bin www/{old_webend => simple_webend}/index.php | 5 ++++- www/{old_webend => simple_webend}/mysql.class.php | 0 www/{old_webend => simple_webend}/parser.php | 0 www/{old_webend => simple_webend}/style.css | 2 +- .../tpl/content.fms.php | 0 www/simple_webend/tpl/content.overview.php | 11 +++++++++++ .../tpl/content.parser.php | 0 .../tpl/content.pocsag.php | 0 .../tpl/content.zvei.php | 0 .../tpl/template.fms.php | 0 .../tpl/template.overview.php | 0 .../tpl/template.parser.php | 0 .../tpl/template.pocsag.php | 0 .../tpl/template.zvei.php | 0 81 files changed, 16 insertions(+), 13 deletions(-) rename www/{new_webend => enhanched_webend}/Alarm.php (100%) rename www/{new_webend => enhanched_webend}/LICENSE.txt (100%) rename www/{new_webend => enhanched_webend}/config.php (100%) rename www/{new_webend => enhanched_webend}/css/font-awesome.min.css (100%) rename www/{new_webend => enhanched_webend}/css/ie/PIE.htc (100%) rename www/{new_webend => enhanched_webend}/css/ie/backgroundsize.min.htc (100%) rename www/{new_webend => enhanched_webend}/css/ie/html5shiv.js (100%) rename www/{new_webend => enhanched_webend}/css/ie/v8.css (100%) rename www/{new_webend => enhanched_webend}/css/images/overlay.png (100%) rename www/{new_webend => enhanched_webend}/css/images/shadow.png (100%) rename www/{new_webend => enhanched_webend}/css/skel.css (100%) rename www/{new_webend => enhanched_webend}/css/style-1000px.css (100%) rename www/{new_webend => enhanched_webend}/css/style-desktop.css (100%) rename www/{new_webend => enhanched_webend}/css/style-mobile.css (100%) rename www/{new_webend => enhanched_webend}/css/style.css (100%) rename www/{new_webend => enhanched_webend}/css/usermod.css (100%) rename www/{new_webend => enhanched_webend}/eintragen.html (100%) rename www/{new_webend => enhanched_webend}/eintragen.php (100%) rename www/{new_webend => enhanched_webend}/fonts/FontAwesome.otf (100%) rename www/{new_webend => enhanched_webend}/fonts/fontawesome-webfont.eot (100%) rename www/{new_webend => enhanched_webend}/fonts/fontawesome-webfont.svg (100%) rename www/{new_webend => enhanched_webend}/fonts/fontawesome-webfont.ttf (100%) rename www/{new_webend => enhanched_webend}/fonts/fontawesome-webfont.woff (100%) rename www/{new_webend => enhanched_webend}/gfx/logo.png (100%) rename www/{new_webend => enhanched_webend}/images/banner.jpg (100%) rename www/{new_webend => enhanched_webend}/images/pic01.jpg (100%) rename www/{new_webend => enhanched_webend}/images/pic02.jpg (100%) rename www/{new_webend => enhanched_webend}/images/pic03.jpg (100%) rename www/{new_webend => enhanched_webend}/images/pic04.jpg (100%) rename www/{new_webend => enhanched_webend}/images/pic05.jpg (100%) rename www/{new_webend => enhanched_webend}/images/pic06.jpg (100%) rename www/{new_webend => enhanched_webend}/images/pic07.jpg (100%) rename www/{new_webend => enhanched_webend}/images/pic08.jpg (100%) rename www/{new_webend => enhanched_webend}/images/pic09.jpg (100%) rename www/{new_webend => enhanched_webend}/images/pic10.jpg (100%) rename www/{new_webend => enhanched_webend}/index.php (100%) rename www/{new_webend => enhanched_webend}/js/init.js (100%) rename www/{new_webend => enhanched_webend}/js/jquery.dropotron.min.js (100%) rename www/{new_webend => enhanched_webend}/js/jquery.min.js (100%) rename www/{new_webend => enhanched_webend}/js/skel-layers.min.js (100%) rename www/{new_webend => enhanched_webend}/js/skel.min.js (100%) rename www/{new_webend => enhanched_webend}/login.php (100%) rename www/{new_webend => enhanched_webend}/prefs.php (100%) rename www/{new_webend => enhanched_webend}/show_fms.php (100%) rename www/{new_webend => enhanched_webend}/show_pocsag.php (100%) rename www/{new_webend => enhanched_webend}/show_zvei.php (100%) rename www/{new_webend => enhanched_webend}/tpl/a_footer.php (100%) rename www/{new_webend => enhanched_webend}/tpl/a_header.php (100%) rename www/{new_webend => enhanched_webend}/tpl/content.overview.php (100%) rename www/{new_webend => enhanched_webend}/tpl/content.parser.php (100%) rename www/{new_webend => enhanched_webend}/tpl/fms.php (100%) rename www/{new_webend => enhanched_webend}/tpl/mysql.class.php (100%) rename www/{new_webend => enhanched_webend}/tpl/parser.php (100%) rename www/{new_webend => enhanched_webend}/tpl/pocsag.php (100%) rename www/{new_webend => enhanched_webend}/tpl/template.overview.php (100%) rename www/{new_webend => enhanched_webend}/tpl/template.parser.php (100%) rename www/{new_webend => enhanched_webend}/tpl/zvei.php (100%) rename www/{new_webend => enhanched_webend}/tpl_old/content.overview.php (100%) rename www/{new_webend => enhanched_webend}/tpl_old/content.parser.php (100%) rename www/{new_webend => enhanched_webend}/tpl_old/template.overview.php (100%) rename www/{new_webend => enhanched_webend}/tpl_old/template.overview.php+ (100%) rename www/{new_webend => enhanched_webend}/tpl_old/template.overview.php.temp (100%) rename www/{new_webend => enhanched_webend}/tpl_old/template.parser.php (100%) delete mode 100644 www/old_webend/tpl/content.overview.php rename www/{old_webend => simple_webend}/config.php (100%) rename www/{old_webend => simple_webend}/gfx/logo.png (100%) rename www/{old_webend => simple_webend}/gfx/lupe.png (100%) rename www/{old_webend => simple_webend}/index.php (85%) rename www/{old_webend => simple_webend}/mysql.class.php (100%) rename www/{old_webend => simple_webend}/parser.php (100%) rename www/{old_webend => simple_webend}/style.css (94%) rename www/{old_webend => simple_webend}/tpl/content.fms.php (100%) create mode 100644 www/simple_webend/tpl/content.overview.php rename www/{old_webend => simple_webend}/tpl/content.parser.php (100%) rename www/{old_webend => simple_webend}/tpl/content.pocsag.php (100%) rename www/{old_webend => simple_webend}/tpl/content.zvei.php (100%) rename www/{old_webend => simple_webend}/tpl/template.fms.php (100%) rename www/{old_webend => simple_webend}/tpl/template.overview.php (100%) rename www/{old_webend => simple_webend}/tpl/template.parser.php (100%) rename www/{old_webend => simple_webend}/tpl/template.pocsag.php (100%) rename www/{old_webend => simple_webend}/tpl/template.zvei.php (100%) diff --git a/www/new_webend/Alarm.php b/www/enhanched_webend/Alarm.php similarity index 100% rename from www/new_webend/Alarm.php rename to www/enhanched_webend/Alarm.php diff --git a/www/new_webend/LICENSE.txt b/www/enhanched_webend/LICENSE.txt similarity index 100% rename from www/new_webend/LICENSE.txt rename to www/enhanched_webend/LICENSE.txt diff --git a/www/new_webend/config.php b/www/enhanched_webend/config.php similarity index 100% rename from www/new_webend/config.php rename to www/enhanched_webend/config.php diff --git a/www/new_webend/css/font-awesome.min.css b/www/enhanched_webend/css/font-awesome.min.css similarity index 100% rename from www/new_webend/css/font-awesome.min.css rename to www/enhanched_webend/css/font-awesome.min.css diff --git a/www/new_webend/css/ie/PIE.htc b/www/enhanched_webend/css/ie/PIE.htc similarity index 100% rename from www/new_webend/css/ie/PIE.htc rename to www/enhanched_webend/css/ie/PIE.htc diff --git a/www/new_webend/css/ie/backgroundsize.min.htc b/www/enhanched_webend/css/ie/backgroundsize.min.htc similarity index 100% rename from www/new_webend/css/ie/backgroundsize.min.htc rename to www/enhanched_webend/css/ie/backgroundsize.min.htc diff --git a/www/new_webend/css/ie/html5shiv.js b/www/enhanched_webend/css/ie/html5shiv.js similarity index 100% rename from www/new_webend/css/ie/html5shiv.js rename to www/enhanched_webend/css/ie/html5shiv.js diff --git a/www/new_webend/css/ie/v8.css b/www/enhanched_webend/css/ie/v8.css similarity index 100% rename from www/new_webend/css/ie/v8.css rename to www/enhanched_webend/css/ie/v8.css diff --git a/www/new_webend/css/images/overlay.png b/www/enhanched_webend/css/images/overlay.png similarity index 100% rename from www/new_webend/css/images/overlay.png rename to www/enhanched_webend/css/images/overlay.png diff --git a/www/new_webend/css/images/shadow.png b/www/enhanched_webend/css/images/shadow.png similarity index 100% rename from www/new_webend/css/images/shadow.png rename to www/enhanched_webend/css/images/shadow.png diff --git a/www/new_webend/css/skel.css b/www/enhanched_webend/css/skel.css similarity index 100% rename from www/new_webend/css/skel.css rename to www/enhanched_webend/css/skel.css diff --git a/www/new_webend/css/style-1000px.css b/www/enhanched_webend/css/style-1000px.css similarity index 100% rename from www/new_webend/css/style-1000px.css rename to www/enhanched_webend/css/style-1000px.css diff --git a/www/new_webend/css/style-desktop.css b/www/enhanched_webend/css/style-desktop.css similarity index 100% rename from www/new_webend/css/style-desktop.css rename to www/enhanched_webend/css/style-desktop.css diff --git a/www/new_webend/css/style-mobile.css b/www/enhanched_webend/css/style-mobile.css similarity index 100% rename from www/new_webend/css/style-mobile.css rename to www/enhanched_webend/css/style-mobile.css diff --git a/www/new_webend/css/style.css b/www/enhanched_webend/css/style.css similarity index 100% rename from www/new_webend/css/style.css rename to www/enhanched_webend/css/style.css diff --git a/www/new_webend/css/usermod.css b/www/enhanched_webend/css/usermod.css similarity index 100% rename from www/new_webend/css/usermod.css rename to www/enhanched_webend/css/usermod.css diff --git a/www/new_webend/eintragen.html b/www/enhanched_webend/eintragen.html similarity index 100% rename from www/new_webend/eintragen.html rename to www/enhanched_webend/eintragen.html diff --git a/www/new_webend/eintragen.php b/www/enhanched_webend/eintragen.php similarity index 100% rename from www/new_webend/eintragen.php rename to www/enhanched_webend/eintragen.php diff --git a/www/new_webend/fonts/FontAwesome.otf b/www/enhanched_webend/fonts/FontAwesome.otf similarity index 100% rename from www/new_webend/fonts/FontAwesome.otf rename to www/enhanched_webend/fonts/FontAwesome.otf diff --git a/www/new_webend/fonts/fontawesome-webfont.eot b/www/enhanched_webend/fonts/fontawesome-webfont.eot similarity index 100% rename from www/new_webend/fonts/fontawesome-webfont.eot rename to www/enhanched_webend/fonts/fontawesome-webfont.eot diff --git a/www/new_webend/fonts/fontawesome-webfont.svg b/www/enhanched_webend/fonts/fontawesome-webfont.svg similarity index 100% rename from www/new_webend/fonts/fontawesome-webfont.svg rename to www/enhanched_webend/fonts/fontawesome-webfont.svg diff --git a/www/new_webend/fonts/fontawesome-webfont.ttf b/www/enhanched_webend/fonts/fontawesome-webfont.ttf similarity index 100% rename from www/new_webend/fonts/fontawesome-webfont.ttf rename to www/enhanched_webend/fonts/fontawesome-webfont.ttf diff --git a/www/new_webend/fonts/fontawesome-webfont.woff b/www/enhanched_webend/fonts/fontawesome-webfont.woff similarity index 100% rename from www/new_webend/fonts/fontawesome-webfont.woff rename to www/enhanched_webend/fonts/fontawesome-webfont.woff diff --git a/www/new_webend/gfx/logo.png b/www/enhanched_webend/gfx/logo.png similarity index 100% rename from www/new_webend/gfx/logo.png rename to www/enhanched_webend/gfx/logo.png diff --git a/www/new_webend/images/banner.jpg b/www/enhanched_webend/images/banner.jpg similarity index 100% rename from www/new_webend/images/banner.jpg rename to www/enhanched_webend/images/banner.jpg diff --git a/www/new_webend/images/pic01.jpg b/www/enhanched_webend/images/pic01.jpg similarity index 100% rename from www/new_webend/images/pic01.jpg rename to www/enhanched_webend/images/pic01.jpg diff --git a/www/new_webend/images/pic02.jpg b/www/enhanched_webend/images/pic02.jpg similarity index 100% rename from www/new_webend/images/pic02.jpg rename to www/enhanched_webend/images/pic02.jpg diff --git a/www/new_webend/images/pic03.jpg b/www/enhanched_webend/images/pic03.jpg similarity index 100% rename from www/new_webend/images/pic03.jpg rename to www/enhanched_webend/images/pic03.jpg diff --git a/www/new_webend/images/pic04.jpg b/www/enhanched_webend/images/pic04.jpg similarity index 100% rename from www/new_webend/images/pic04.jpg rename to www/enhanched_webend/images/pic04.jpg diff --git a/www/new_webend/images/pic05.jpg b/www/enhanched_webend/images/pic05.jpg similarity index 100% rename from www/new_webend/images/pic05.jpg rename to www/enhanched_webend/images/pic05.jpg diff --git a/www/new_webend/images/pic06.jpg b/www/enhanched_webend/images/pic06.jpg similarity index 100% rename from www/new_webend/images/pic06.jpg rename to www/enhanched_webend/images/pic06.jpg diff --git a/www/new_webend/images/pic07.jpg b/www/enhanched_webend/images/pic07.jpg similarity index 100% rename from www/new_webend/images/pic07.jpg rename to www/enhanched_webend/images/pic07.jpg diff --git a/www/new_webend/images/pic08.jpg b/www/enhanched_webend/images/pic08.jpg similarity index 100% rename from www/new_webend/images/pic08.jpg rename to www/enhanched_webend/images/pic08.jpg diff --git a/www/new_webend/images/pic09.jpg b/www/enhanched_webend/images/pic09.jpg similarity index 100% rename from www/new_webend/images/pic09.jpg rename to www/enhanched_webend/images/pic09.jpg diff --git a/www/new_webend/images/pic10.jpg b/www/enhanched_webend/images/pic10.jpg similarity index 100% rename from www/new_webend/images/pic10.jpg rename to www/enhanched_webend/images/pic10.jpg diff --git a/www/new_webend/index.php b/www/enhanched_webend/index.php similarity index 100% rename from www/new_webend/index.php rename to www/enhanched_webend/index.php diff --git a/www/new_webend/js/init.js b/www/enhanched_webend/js/init.js similarity index 100% rename from www/new_webend/js/init.js rename to www/enhanched_webend/js/init.js diff --git a/www/new_webend/js/jquery.dropotron.min.js b/www/enhanched_webend/js/jquery.dropotron.min.js similarity index 100% rename from www/new_webend/js/jquery.dropotron.min.js rename to www/enhanched_webend/js/jquery.dropotron.min.js diff --git a/www/new_webend/js/jquery.min.js b/www/enhanched_webend/js/jquery.min.js similarity index 100% rename from www/new_webend/js/jquery.min.js rename to www/enhanched_webend/js/jquery.min.js diff --git a/www/new_webend/js/skel-layers.min.js b/www/enhanched_webend/js/skel-layers.min.js similarity index 100% rename from www/new_webend/js/skel-layers.min.js rename to www/enhanched_webend/js/skel-layers.min.js diff --git a/www/new_webend/js/skel.min.js b/www/enhanched_webend/js/skel.min.js similarity index 100% rename from www/new_webend/js/skel.min.js rename to www/enhanched_webend/js/skel.min.js diff --git a/www/new_webend/login.php b/www/enhanched_webend/login.php similarity index 100% rename from www/new_webend/login.php rename to www/enhanched_webend/login.php diff --git a/www/new_webend/prefs.php b/www/enhanched_webend/prefs.php similarity index 100% rename from www/new_webend/prefs.php rename to www/enhanched_webend/prefs.php diff --git a/www/new_webend/show_fms.php b/www/enhanched_webend/show_fms.php similarity index 100% rename from www/new_webend/show_fms.php rename to www/enhanched_webend/show_fms.php diff --git a/www/new_webend/show_pocsag.php b/www/enhanched_webend/show_pocsag.php similarity index 100% rename from www/new_webend/show_pocsag.php rename to www/enhanched_webend/show_pocsag.php diff --git a/www/new_webend/show_zvei.php b/www/enhanched_webend/show_zvei.php similarity index 100% rename from www/new_webend/show_zvei.php rename to www/enhanched_webend/show_zvei.php diff --git a/www/new_webend/tpl/a_footer.php b/www/enhanched_webend/tpl/a_footer.php similarity index 100% rename from www/new_webend/tpl/a_footer.php rename to www/enhanched_webend/tpl/a_footer.php diff --git a/www/new_webend/tpl/a_header.php b/www/enhanched_webend/tpl/a_header.php similarity index 100% rename from www/new_webend/tpl/a_header.php rename to www/enhanched_webend/tpl/a_header.php diff --git a/www/new_webend/tpl/content.overview.php b/www/enhanched_webend/tpl/content.overview.php similarity index 100% rename from www/new_webend/tpl/content.overview.php rename to www/enhanched_webend/tpl/content.overview.php diff --git a/www/new_webend/tpl/content.parser.php b/www/enhanched_webend/tpl/content.parser.php similarity index 100% rename from www/new_webend/tpl/content.parser.php rename to www/enhanched_webend/tpl/content.parser.php diff --git a/www/new_webend/tpl/fms.php b/www/enhanched_webend/tpl/fms.php similarity index 100% rename from www/new_webend/tpl/fms.php rename to www/enhanched_webend/tpl/fms.php diff --git a/www/new_webend/tpl/mysql.class.php b/www/enhanched_webend/tpl/mysql.class.php similarity index 100% rename from www/new_webend/tpl/mysql.class.php rename to www/enhanched_webend/tpl/mysql.class.php diff --git a/www/new_webend/tpl/parser.php b/www/enhanched_webend/tpl/parser.php similarity index 100% rename from www/new_webend/tpl/parser.php rename to www/enhanched_webend/tpl/parser.php diff --git a/www/new_webend/tpl/pocsag.php b/www/enhanched_webend/tpl/pocsag.php similarity index 100% rename from www/new_webend/tpl/pocsag.php rename to www/enhanched_webend/tpl/pocsag.php diff --git a/www/new_webend/tpl/template.overview.php b/www/enhanched_webend/tpl/template.overview.php similarity index 100% rename from www/new_webend/tpl/template.overview.php rename to www/enhanched_webend/tpl/template.overview.php diff --git a/www/new_webend/tpl/template.parser.php b/www/enhanched_webend/tpl/template.parser.php similarity index 100% rename from www/new_webend/tpl/template.parser.php rename to www/enhanched_webend/tpl/template.parser.php diff --git a/www/new_webend/tpl/zvei.php b/www/enhanched_webend/tpl/zvei.php similarity index 100% rename from www/new_webend/tpl/zvei.php rename to www/enhanched_webend/tpl/zvei.php diff --git a/www/new_webend/tpl_old/content.overview.php b/www/enhanched_webend/tpl_old/content.overview.php similarity index 100% rename from www/new_webend/tpl_old/content.overview.php rename to www/enhanched_webend/tpl_old/content.overview.php diff --git a/www/new_webend/tpl_old/content.parser.php b/www/enhanched_webend/tpl_old/content.parser.php similarity index 100% rename from www/new_webend/tpl_old/content.parser.php rename to www/enhanched_webend/tpl_old/content.parser.php diff --git a/www/new_webend/tpl_old/template.overview.php b/www/enhanched_webend/tpl_old/template.overview.php similarity index 100% rename from www/new_webend/tpl_old/template.overview.php rename to www/enhanched_webend/tpl_old/template.overview.php diff --git a/www/new_webend/tpl_old/template.overview.php+ b/www/enhanched_webend/tpl_old/template.overview.php+ similarity index 100% rename from www/new_webend/tpl_old/template.overview.php+ rename to www/enhanched_webend/tpl_old/template.overview.php+ diff --git a/www/new_webend/tpl_old/template.overview.php.temp b/www/enhanched_webend/tpl_old/template.overview.php.temp similarity index 100% rename from www/new_webend/tpl_old/template.overview.php.temp rename to www/enhanched_webend/tpl_old/template.overview.php.temp diff --git a/www/new_webend/tpl_old/template.parser.php b/www/enhanched_webend/tpl_old/template.parser.php similarity index 100% rename from www/new_webend/tpl_old/template.parser.php rename to www/enhanched_webend/tpl_old/template.parser.php diff --git a/www/old_webend/tpl/content.overview.php b/www/old_webend/tpl/content.overview.php deleted file mode 100644 index 88a5f8c..0000000 --- a/www/old_webend/tpl/content.overview.php +++ /dev/null @@ -1,11 +0,0 @@ -query("SELECT id, time, concat(fms, ' Stat:', status, ' Dir:', directionText) as data, description, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, description, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, concat(ric, ' ', functionChar) as data, description, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC LIMIT 25"); -$Rows = array(); -while ($daten = $db->fetchAssoc()) -{ - $Rows[] = $daten; -} -$tpl['lastAla'] = $Rows; diff --git a/www/old_webend/config.php b/www/simple_webend/config.php similarity index 100% rename from www/old_webend/config.php rename to www/simple_webend/config.php diff --git a/www/old_webend/gfx/logo.png b/www/simple_webend/gfx/logo.png similarity index 100% rename from www/old_webend/gfx/logo.png rename to www/simple_webend/gfx/logo.png diff --git a/www/old_webend/gfx/lupe.png b/www/simple_webend/gfx/lupe.png similarity index 100% rename from www/old_webend/gfx/lupe.png rename to www/simple_webend/gfx/lupe.png diff --git a/www/old_webend/index.php b/www/simple_webend/index.php similarity index 85% rename from www/old_webend/index.php rename to www/simple_webend/index.php index 737d621..b144d41 100644 --- a/www/old_webend/index.php +++ b/www/simple_webend/index.php @@ -65,7 +65,10 @@ $db = new Database($dbhost, $dbuser, $dbpassword, $database, 1); //Show Error = ?> - + diff --git a/www/old_webend/mysql.class.php b/www/simple_webend/mysql.class.php similarity index 100% rename from www/old_webend/mysql.class.php rename to www/simple_webend/mysql.class.php diff --git a/www/old_webend/parser.php b/www/simple_webend/parser.php similarity index 100% rename from www/old_webend/parser.php rename to www/simple_webend/parser.php diff --git a/www/old_webend/style.css b/www/simple_webend/style.css similarity index 94% rename from www/old_webend/style.css rename to www/simple_webend/style.css index fd88f4c..c2ef6ff 100644 --- a/www/old_webend/style.css +++ b/www/simple_webend/style.css @@ -39,4 +39,4 @@ tr:nth-child(2n+3) { background: #CCC; } text-align: center; color: gray; } -#footer a{ color: gray; } +#footer a{ color: gray; font-weight: bold;} diff --git a/www/old_webend/tpl/content.fms.php b/www/simple_webend/tpl/content.fms.php similarity index 100% rename from www/old_webend/tpl/content.fms.php rename to www/simple_webend/tpl/content.fms.php diff --git a/www/simple_webend/tpl/content.overview.php b/www/simple_webend/tpl/content.overview.php new file mode 100644 index 0000000..c70c765 --- /dev/null +++ b/www/simple_webend/tpl/content.overview.php @@ -0,0 +1,11 @@ +query("SELECT id, time, concat(fms, ' Stat:', status, ' (', directionText, ')') as data, description, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, description, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, concat(ric, ' ', functionChar) as data, description, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC LIMIT 25"); +$Rows = array(); +while ($daten = $db->fetchAssoc()) +{ + $Rows[] = $daten; +} +$tpl['lastAla'] = $Rows; diff --git a/www/old_webend/tpl/content.parser.php b/www/simple_webend/tpl/content.parser.php similarity index 100% rename from www/old_webend/tpl/content.parser.php rename to www/simple_webend/tpl/content.parser.php diff --git a/www/old_webend/tpl/content.pocsag.php b/www/simple_webend/tpl/content.pocsag.php similarity index 100% rename from www/old_webend/tpl/content.pocsag.php rename to www/simple_webend/tpl/content.pocsag.php diff --git a/www/old_webend/tpl/content.zvei.php b/www/simple_webend/tpl/content.zvei.php similarity index 100% rename from www/old_webend/tpl/content.zvei.php rename to www/simple_webend/tpl/content.zvei.php diff --git a/www/old_webend/tpl/template.fms.php b/www/simple_webend/tpl/template.fms.php similarity index 100% rename from www/old_webend/tpl/template.fms.php rename to www/simple_webend/tpl/template.fms.php diff --git a/www/old_webend/tpl/template.overview.php b/www/simple_webend/tpl/template.overview.php similarity index 100% rename from www/old_webend/tpl/template.overview.php rename to www/simple_webend/tpl/template.overview.php diff --git a/www/old_webend/tpl/template.parser.php b/www/simple_webend/tpl/template.parser.php similarity index 100% rename from www/old_webend/tpl/template.parser.php rename to www/simple_webend/tpl/template.parser.php diff --git a/www/old_webend/tpl/template.pocsag.php b/www/simple_webend/tpl/template.pocsag.php similarity index 100% rename from www/old_webend/tpl/template.pocsag.php rename to www/simple_webend/tpl/template.pocsag.php diff --git a/www/old_webend/tpl/template.zvei.php b/www/simple_webend/tpl/template.zvei.php similarity index 100% rename from www/old_webend/tpl/template.zvei.php rename to www/simple_webend/tpl/template.zvei.php From a15043e8f4ab933ff23075afd600407289b2d4b8 Mon Sep 17 00:00:00 2001 From: Schrolli Date: Tue, 14 Jul 2015 13:46:17 +0200 Subject: [PATCH 8/8] edit simple_webend - click on the glass in overview shows the entry highlighted --- www/simple_webend/style.css | 10 ++++++++-- www/simple_webend/tpl/template.fms.php | 7 ++++++- www/simple_webend/tpl/template.pocsag.php | 7 ++++++- www/simple_webend/tpl/template.zvei.php | 7 ++++++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/www/simple_webend/style.css b/www/simple_webend/style.css index c2ef6ff..bf5662e 100644 --- a/www/simple_webend/style.css +++ b/www/simple_webend/style.css @@ -21,8 +21,8 @@ table, th, td { border: 1px solid black; } /*alternating line color in table*/ /*without first line (header)*/ -tr:nth-child(2n+2) { background: #FFF; } -tr:nth-child(2n+3) { background: #CCC; } +tr:nth-child(2n+2) { background: white; } +tr:nth-child(2n+3) { background: lightgray; } /*table head*/ .tableHead{ @@ -31,6 +31,12 @@ tr:nth-child(2n+3) { background: #CCC; } font-weight: bold; } +.highlight { + color: #BE2F01; + font-weight: bold; + border: 2px solid #BE2F01; +} + /*footer*/ #footer{ diff --git a/www/simple_webend/tpl/template.fms.php b/www/simple_webend/tpl/template.fms.php index 5342236..855efe7 100644 --- a/www/simple_webend/tpl/template.fms.php +++ b/www/simple_webend/tpl/template.fms.php @@ -16,7 +16,12 @@ $time = strtotime($fms['time']); $time = date("d.m.Y H:i:s", $time); - echo ""; + if(!empty($_GET['id']) && $_GET['id'] == $fms['id']){ + echo ""; + } + else{ + echo ""; + } echo ""; echo ""; echo ""; diff --git a/www/simple_webend/tpl/template.pocsag.php b/www/simple_webend/tpl/template.pocsag.php index 6b68449..37f7a2f 100644 --- a/www/simple_webend/tpl/template.pocsag.php +++ b/www/simple_webend/tpl/template.pocsag.php @@ -16,7 +16,12 @@ $time = strtotime($poc['time']); $time = date("d.m.Y H:i:s", $time); - echo ""; + if(!empty($_GET['id']) && $_GET['id'] == $poc['id']){ + echo ""; + } + else{ + echo ""; + } echo ""; echo ""; echo ""; diff --git a/www/simple_webend/tpl/template.zvei.php b/www/simple_webend/tpl/template.zvei.php index b8b40a1..f3390ae 100644 --- a/www/simple_webend/tpl/template.zvei.php +++ b/www/simple_webend/tpl/template.zvei.php @@ -13,7 +13,12 @@ $time = strtotime($zvei['time']); $time = date("d.m.Y H:i:s", $time); - echo ""; + if(!empty($_GET['id']) && $_GET['id'] == $zvei['id']){ + echo ""; + } + else{ + echo ""; + } echo ""; echo ""; echo "";
ID Datum - Zeit Typ DatenBeschreibung
". $lastAla['typ'] . "". $lastAla['data'] . "". $lastAla['description'] . "show
". $fms['id'] . "". $time . "". $fms['fms'] . "
". $poc['id'] . "". $time . "". $poc['ric'] . "
". $zvei['id'] . "". $time . "". $zvei['zvei'] . "