# HG changeset patch # User julien # Date 1438274464 -7200 # Node ID 4209729fcaf64de647aa0854bda183ea582c3ec6 # Parent dd52219147fe3bc4ea1d3169d7f8e71e9b18a8f4 integration of first scenario's design and add Open-Sans fonts diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/css/style.css --- a/server/src/remie/static/remie/css/style.css Thu Jul 30 18:35:54 2015 +0200 +++ b/server/src/remie/static/remie/css/style.css Thu Jul 30 18:41:04 2015 +0200 @@ -0,0 +1,276 @@ +@font-face { + font-family: Open-Sans-Light; /*a name to be used later*/ + src: url(../fonts/Open_Sans/OpenSans-Light.ttf); /*URL to font*/ +} + +html, body{ + margin:0; + padding:6px; +} + +#media_panel{ + float:left; +} + +.segment_title{ + margin:0; + height: 40px; + line-height: 40px; + background-color: #F3F7F8; + color:#C0C0C0; + font-size: 21px; + padding: 0 10px; + font-family: Open-Sans-Light; +} +#player_container{ + margin-top:40px; +} + +#info_panel{ + float: left; + height: 100%; + margin-left: 15px; + width: 512px; +} + +/*#CurrentSegmentInfobox_container, +#LatestAnnotation_container, +#AnnotationsController_container, +#CreateAnnotation_container, +#AnnotationsList_container{ + max-width: 537px; +}*/ + +#player_container{ + height: 380px; + width: 625px; +} + +.Ldt-Widget{ + font-family: Open-Sans-Light; +} + +#CurrentSegmentInfobox_container .Ldt-CurrentSegmentInfobox, +#LatestAnnotation_container .Ldt-LatestAnnotation{ + background: inherit; + background-color: #F3F7F8; + border:none; + margin:0; + color: #848484; + padding: 1px; + display: table-cell; +} + +#LatestAnnotation_container .Ldt-LatestAnnotation-Box { + background: inherit; +} + +.Ldt-CurrentSegmentInfobox-Element.Ldt-CurrentSegmentInfobox-NoSegment{ + color: #C0C0C0; + font-size:21px; +} +.Ldt-CurrentSegmentInfobox-Element.Ldt-CurrentSegmentInfobox-Title{ + color: #848484; + font-size:21px; +} +.Ldt-CurrentSegmentInfobox-Element.Ldt-CurrentSegmentInfobox-Description{ + font-weight: normal; + font-size: 16px; + text-indent: 2px; +} + +.Ldt-CurrentSegmentInfobox-Element.Ldt-CurrentSegmentInfobox-NoSegment, +.Ldt-CurrentSegmentInfobox-Element.Ldt-CurrentSegmentInfobox-Title{ + background-color: #F3F7F8; + border: none; + height: 40px; + line-height: 40px; + font-family: Open-Sans-Light; + position: absolute; + left: 12px; + top: 12px; + width: 640px; + margin:0; + font-weight: normal; + + text-indent:10px; +} + +.Ldt-CurrentSegmentInfobox-Tags-Ul{ + padding:0; +} + +.Ldt-CurrentSegmentInfobox-Tags-Ul .Ldt-CurrentSegmentInfobox-Tags-Li{ + border:none; + font-size:16px; +} + +#info_panel p{ + margin-top:20px; + margin-bottom: 0; + font-family: Open-Sans-Light; + color: #848484; + font-weight: bold; +} + +.Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-CreationDate, +.Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-Title, +.Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-Content{ + font-family: Open-Sans-Light; + color: #848484; +} + +.Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-CreationDate, +.Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-Content{ + margin-top:7px; +} + +.Ldt-LatestAnnotation-box .Ldt-LatestAnnotation-CopyEditButton, +.Ldt-AnnotationsController-Button.Ldt-AnnotationsController-ShowAnnotationsListButton, +.Ldt-AnnotationsController-Button.Ldt-AnnotationsController-ShowCreateAnnotationButton, +.Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main input { + background: inherit; + border: none; + background-color: #848484; + font-family: Open-Sans-Light; + font-size: 14px; + border-radius: 0 0 3px 0; +} + +.Ldt-LatestAnnotation-box .Ldt-LatestAnnotation-CopyEditButton:hover, +.Ldt-AnnotationsController-Button.Ldt-AnnotationsController-ShowAnnotationsListButton:hover, +.Ldt-AnnotationsController-Button.Ldt-AnnotationsController-ShowCreateAnnotationButton:hover, +.Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main input:hover { + background-color: #b7b7b7; +} + +.Ldt-LatestAnnotation-box .Ldt-LatestAnnotation-CopyEditButton{ + height: 22px; + margin-top: 1px; + padding-top: 4px; +} + +.Ldt-AnnotationsController-Button.Ldt-AnnotationsController-ShowAnnotationsListButton, +.Ldt-AnnotationsController-Button.Ldt-AnnotationsController-ShowCreateAnnotationButton { + height: 27px; + margin: 0 7px 0 0; + padding-top: 0px; + width: 80px; + float: left; +} + +.Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main input{ + height: 30px; + padding: 0; + width: 90px; + bottom: 14px; +} + +.Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main .Ldt-CreateAnnotation-Submit{ + background-color: #a2cf18; + left: 0; +} +.Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main .Ldt-CreateAnnotation-Cancel{ + background-color: #CD000B; + left: 95px; +} + +#AnnotationsController_container .Ldt-AnnotationsController{ + border:none; + background: inherit; + display: inline-block; + width: 100%; + margin: 8px 0 0; +} + +.Ldt-CreateAnnotation .Ldt-CreateAnnotation-Inner h3{ + display: none; +} + +#CreateAnnotation_container .Ldt-CreateAnnotation{ + border:none; + padding: 0; +} + +.Ldt-CreateAnnotation .Ldt-CreateAnnotation-Inner{ + background:none; + padding: 0; +} + +.Ldt-CreateAnnotation-Inner .Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main{ + margin-top: 30px; +} + +.Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main textarea{ + border-color: #848484 !important; + border-width: 2px; + border-radius: 0; + padding: 10px; + min-height: 100px; + font-family: Open-Sans-Light; + width: 100%; +} + +.Ldt-CreateAnnotation-Screen.Ldt-CreateAnnotation-Main .Ldt-CreateAnnotation-Avatar{ + display: none; +} + +ul.Ldt-AnnotationsList-ul li:nth-child(2n+1){ + background-color: #f0f5f6; +} + +ul.Ldt-AnnotationsList-ul li.Ldt-AnnotationsList-li{ + min-height: 30px; + line-height: 30px; + cursor: pointer; +} +li.Ldt-AnnotationsList-li:hover{ + background: none; + border: 2px solid #848484; + margin: -2px; +} +li.Ldt-AnnotationsList-li:first-child:hover{ + margin-top:0; +} + +.Ldt-AnnotationsList-li .Ldt-AnnotationsList-ThumbContainer, +.Ldt-AnnotationsList-li h3.Ldt-AnnotationsList-Title, +.Ldt-LatestAnnotation-Element.Ldt-LatestAnnotation-Title{ + display: none; +} + +.Ldt-AnnotationsList-li .Ldt-AnnotationsList-Description, +.Ldt-AnnotationsList-li .Ldt-AnnotationsList-CreationDate{ + margin: 0 5px; + display: inline; + font-family: Open-Sans-Light; + font-weight: normal; + color: #848484; +} +.Ldt-AnnotationsList-li .Ldt-AnnotationsList-Title a, +.Ldt-AnnotationsList-li p.Ldt-AnnotationsList-Title{ + color: #848484; + font-weight: normal; +} +.Ldt-AnnotationsList-li .Ldt-AnnotationsList-CreationDate{ + float:left; + margin-right: 20px +} + +.Ldt-AnnotationsListWidget .Ldt-AnnotationsList-Filters{ + display: none; +} + +#player_container_widget_Segments_7{ + height: 50px !important; + margin: 5px 0 !important; +} + +.Ldt-Segments-List .Ldt-Segments-Segment{ + background-color: #848484 !important; + border-width: 0 5px !important; + height: 50px !important; +} +.Ldt-Segments-List .Ldt-Segments-Segment:hover{ + background-color: #a2a2a2 !important; +} \ No newline at end of file diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/LICENSE.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/remie/static/remie/fonts/Open_Sans/LICENSE.txt Thu Jul 30 18:41:04 2015 +0200 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/OpenSans-Bold.ttf Binary file server/src/remie/static/remie/fonts/Open_Sans/OpenSans-Bold.ttf has changed diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/OpenSans-BoldItalic.ttf Binary file server/src/remie/static/remie/fonts/Open_Sans/OpenSans-BoldItalic.ttf has changed diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/OpenSans-ExtraBold.ttf Binary file server/src/remie/static/remie/fonts/Open_Sans/OpenSans-ExtraBold.ttf has changed diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf Binary file server/src/remie/static/remie/fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf has changed diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/OpenSans-Italic.ttf Binary file server/src/remie/static/remie/fonts/Open_Sans/OpenSans-Italic.ttf has changed diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/OpenSans-Light.ttf Binary file server/src/remie/static/remie/fonts/Open_Sans/OpenSans-Light.ttf has changed diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/OpenSans-LightItalic.ttf Binary file server/src/remie/static/remie/fonts/Open_Sans/OpenSans-LightItalic.ttf has changed diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/OpenSans-Regular.ttf Binary file server/src/remie/static/remie/fonts/Open_Sans/OpenSans-Regular.ttf has changed diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/OpenSans-Semibold.ttf Binary file server/src/remie/static/remie/fonts/Open_Sans/OpenSans-Semibold.ttf has changed diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/static/remie/fonts/Open_Sans/OpenSans-SemiboldItalic.ttf Binary file server/src/remie/static/remie/fonts/Open_Sans/OpenSans-SemiboldItalic.ttf has changed diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/templates/remie/iframe.html --- a/server/src/remie/templates/remie/iframe.html Thu Jul 30 18:35:54 2015 +0200 +++ b/server/src/remie/templates/remie/iframe.html Thu Jul 30 18:41:04 2015 +0200 @@ -2,17 +2,22 @@ Test + -
-
-
-
-
-
-
-
+
+
+
+
+
+
+

Ma dernière contribution

+
+
+
+

Mes dernières contributions

+
diff -r dd52219147fe -r 4209729fcaf6 server/src/remie/templates/remie/iframe_tester.html --- a/server/src/remie/templates/remie/iframe_tester.html Thu Jul 30 18:35:54 2015 +0200 +++ b/server/src/remie/templates/remie/iframe_tester.html Thu Jul 30 18:41:04 2015 +0200 @@ -69,19 +69,19 @@ -
+


-
+ -
- -
+ + + \ No newline at end of file