refined draft

14 files changed, 189 insertions, 15 deletions

diff --git a/module/plugins/Base.py b/module/plugins/Base.py
index 905744c9e..c97c42328 100644
--- a/module/plugins/Base.py
+++ b/module/plugins/Base.py
@@ -50,6 +50,7 @@ class Base(object):
     #: Config definition: list of  (name, type, verbose_name, default_value) or
     #: (name, type, verbose_name, short_description, default_value)
     __config__ = list()
+    __label__ = "" #TODO: default should be name, makes long_desc obsolete?
     #: Short description, one liner
     __description__ = ""
     #: More detailed text
diff --git a/module/web/mockups/font.css b/module/web/mockups/font.css
new file mode 100644
index 000000000..161542173
--- /dev/null
+++ b/module/web/mockups/font.css
@@ -0,0 +1,89 @@
+/**
+ * @file
+ * Font styling
+ */
+
+@font-face {
+    font-family: 'SansationRegular';
+    src: url('fonts/Sansation_Regular-webfont.eot');
+    src: url('fonts/Sansation_Regular-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/Sansation_Regular-webfont.woff') format('woff'),
+         url('fonts/Sansation_Regular-webfont.ttf') format('truetype'),
+         url('fonts/Sansation_Regular-webfont.svg#SansationRegular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'SansationLight';
+    src: url('fonts/Sansation_Light-webfont.eot');
+    src: url('fonts/Sansation_Light-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/Sansation_Light-webfont.woff') format('woff'),
+         url('fonts/Sansation_Light-webfont.ttf') format('truetype'),
+         url('fonts/Sansation_Light-webfont.svg#SansationLight') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'SansationBold';
+    src: url('fonts/Sansation_Bold-webfont.eot');
+    src: url('fonts/Sansation_Bold-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/Sansation_Bold-webfont.woff') format('woff'),
+         url('fonts/Sansation_Bold-webfont.ttf') format('truetype'),
+         url('fonts/Sansation_Bold-webfont.svg#SansationBold') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+
+@font-face {
+    font-family: 'DroidSerifRegular';
+    src: url('fonts/DroidSerif-Regular-webfont.eot');
+    src: url('fonts/DroidSerif-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/DroidSerif-Regular-webfont.woff') format('woff'),
+         url('fonts/DroidSerif-Regular-webfont.ttf') format('truetype'),
+         url('fonts/DroidSerif-Regular-webfont.svg#DroidSerifRegular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'DroidSerifItalic';
+    src: url('fonts/DroidSerif-Italic-webfont.eot');
+    src: url('fonts/DroidSerif-Italic-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/DroidSerif-Italic-webfont.woff') format('woff'),
+         url('fonts/DroidSerif-Italic-webfont.ttf') format('truetype'),
+         url('fonts/DroidSerif-Italic-webfont.svg#DroidSerifItalic') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'DroidSerifBold';
+    src: url('fonts/DroidSerif-Bold-webfont.eot');
+    src: url('fonts/DroidSerif-Bold-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/DroidSerif-Bold-webfont.woff') format('woff'),
+         url('fonts/DroidSerif-Bold-webfont.ttf') format('truetype'),
+         url('fonts/DroidSerif-Bold-webfont.svg#DroidSerifBold') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
+@font-face {
+    font-family: 'DroidSerifBoldItalic';
+    src: url('fonts/DroidSerif-BoldItalic-webfont.eot');
+    src: url('fonts/DroidSerif-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
+         url('fonts/DroidSerif-BoldItalic-webfont.woff') format('woff'),
+         url('fonts/DroidSerif-BoldItalic-webfont.ttf') format('truetype'),
+         url('fonts/DroidSerif-BoldItalic-webfont.svg#DroidSerifBoldItalic') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
\ No newline at end of file
diff --git a/module/web/mockups/fonts/Sansation_Bold-webfont.eot b/module/web/mockups/fonts/Sansation_Bold-webfont.eot
new file mode 100644
index 000000000..43ed2ee31
--- /dev/null
+++ b/module/web/mockups/fonts/Sansation_Bold-webfont.eot
diff --git a/module/web/mockups/fonts/Sansation_Bold-webfont.ttf b/module/web/mockups/fonts/Sansation_Bold-webfont.ttf
new file mode 100644
index 000000000..d2e7c4c2a
--- /dev/null
+++ b/module/web/mockups/fonts/Sansation_Bold-webfont.ttf
diff --git a/module/web/mockups/fonts/Sansation_Bold-webfont.woff b/module/web/mockups/fonts/Sansation_Bold-webfont.woff
new file mode 100644
index 000000000..9ee938d55
--- /dev/null
+++ b/module/web/mockups/fonts/Sansation_Bold-webfont.woff
diff --git a/module/web/mockups/fonts/Sansation_Light-webfont.eot b/module/web/mockups/fonts/Sansation_Light-webfont.eot
new file mode 100644
index 000000000..d83fa9cf6
--- /dev/null
+++ b/module/web/mockups/fonts/Sansation_Light-webfont.eot
diff --git a/module/web/mockups/fonts/Sansation_Light-webfont.ttf b/module/web/mockups/fonts/Sansation_Light-webfont.ttf
new file mode 100644
index 000000000..64d734bec
--- /dev/null
+++ b/module/web/mockups/fonts/Sansation_Light-webfont.ttf
diff --git a/module/web/mockups/fonts/Sansation_Light-webfont.woff b/module/web/mockups/fonts/Sansation_Light-webfont.woff
new file mode 100644
index 000000000..5f3dce493
--- /dev/null
+++ b/module/web/mockups/fonts/Sansation_Light-webfont.woff
diff --git a/module/web/mockups/fonts/Sansation_Regular-webfont.eot b/module/web/mockups/fonts/Sansation_Regular-webfont.eot
new file mode 100644
index 000000000..46219c9ff
--- /dev/null
+++ b/module/web/mockups/fonts/Sansation_Regular-webfont.eot
diff --git a/module/web/mockups/fonts/Sansation_Regular-webfont.ttf b/module/web/mockups/fonts/Sansation_Regular-webfont.ttf
new file mode 100644
index 000000000..92f686359
--- /dev/null
+++ b/module/web/mockups/fonts/Sansation_Regular-webfont.ttf
diff --git a/module/web/mockups/fonts/Sansation_Regular-webfont.woff b/module/web/mockups/fonts/Sansation_Regular-webfont.woff
new file mode 100644
index 000000000..524b67992
--- /dev/null
+++ b/module/web/mockups/fonts/Sansation_Regular-webfont.woff
diff --git a/module/web/mockups/images/Logo_grey.png b/module/web/mockups/images/Logo_grey.png
new file mode 100644
index 000000000..7061372aa
--- /dev/null
+++ b/module/web/mockups/images/Logo_grey.png
diff --git a/module/web/mockups/images/fancy_deboss.png b/module/web/mockups/images/fancy_deboss.png
new file mode 100644
index 000000000..926a762db
--- /dev/null
+++ b/module/web/mockups/images/fancy_deboss.png
diff --git a/module/web/mockups/index.html b/module/web/mockups/index.html
index 8b3dce120..a709d7ca7 100644
--- a/module/web/mockups/index.html
+++ b/module/web/mockups/index.html
@@ -17,10 +17,13 @@ Released   : 20120325
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />

 <title>Naturalprime by FCT</title>

 <link href="http://fonts.googleapis.com/css?family=Abel" rel="stylesheet" type="text/css" />

+<link href="font.css" rel="stylesheet" type="text/css"/>

 <link href="style.css" rel="stylesheet" type="text/css" media="screen" />

-<script type="text/javascript" src="jquery/jquery-1.4.2.min.js"></script>

-<script type="text/javascript" src="jquery/jquery.gallerax-0.2.js"></script>

 <style type="text/css">

+    body {

+        background: url("images/fancy_deboss.png") repeat scroll 0 0 transparent;

+    }

+

     header {

         background: url("images/main-wrapper-bg.png") repeat-x;

         height: 70px;

@@ -29,8 +32,21 @@ Released   : 20120325
         vertical-align: top;

         width: 100%;

         z-index: 10;

-        box-shadow: 0 2px rgba(0,0,0,0.5);

+   /*     box-shadow: 0 4px 2px -2px rgba(0,0,0,0.5);*/

+    }

+

+    header:before {

+        position: absolute;

+        content: ' ';

+        top: 0;

+        right: 0;

+        bottom: 0;

+        left: 0;

+        background-color: transparent;

+        box-shadow: 0 0 5px black;

+        z-index: -1;

     }

+

     header div.center {

         padding-left: 20px;

         padding-right: 20px;

@@ -38,26 +54,68 @@ Released   : 20120325
     header div.center span.title {

         color: white;

         float: left;

-        font-family: "Vegur Light";

+        font-family: SansationRegular, sans-serif;

         font-size: 40px;

-        margin-left: -10px;

-        margin-top: 7px;

+        margin-top: 12px;

     }

     header img.logo {

         float: left;

-        padding-right: 30px;

+        padding-right: 10px;

         padding-top: 7px;

         width: 120px;

     }

     footer {

         background: url("images/main-wrapper-bg.png") repeat-x;

         height: 100px;

-        margin-top: -100px;

         position: relative;

         width: 100%;

         z-index: 10;

-        box-shadow: 0 0 2px 2px rgba(0,0,0,0.5);

     }

+

+    footer img.logo {

+        float: left;

+        padding-top: 12px;

+        padding-right: 12px;

+    }

+

+    footer div.center {

+        padding-left: 50px;

+        padding-top: 10px;

+    }

+

+    footer:before {

+        position: absolute;

+        content: ' ';

+        top: 0;

+        right: 0;

+        bottom: 0;

+        left: 0;

+        background-color: transparent;

+        box-shadow: 0 0 5px black;

+        z-index: -1;

+    }

+

+    footer .block {

+        font-size: 12px;

+        float: left;

+        margin: 0;

+        width: 150px;

+        padding-top: 6px;

+        padding-right: 30px;

+    }

+

+    footer h2 {

+        background: url("images/double-line.gif") repeat-x scroll center bottom transparent !important;

+        color: #FFFFFF;

+        font-family: SansationLight, sans-serif;

+        font-size: 16px;

+        font-weight: normal;

+        line-height: 16px;

+        margin: 0;

+        padding-bottom: 6px;

+    }

+

+

 </style>

 </head>

 <body>

@@ -143,14 +201,40 @@ Released   : 20120325
 	</div>

 	<!-- end #page --> 

 </div>

-<div id="footer">

-    <p>Copyright (c) 2012 pyload.org. All rights reserved. Design by <a href="http://www.freecsstemplates.org">FCT</a>.</p>

-</div>

-

 <footer>

     <div class="center">

-        <br>

-        Footer here

+    <img class="logo" src="images/Logo_grey.png"/>

+

+    <div class="block">

+        <h2 class="block-title">Powered by</h2>

+         asd <br>

+         dsfdsf <br>

+         sdf dsg <br>

+    </div>

+

+        <div class="block">

+            <h2 class="block-title">pyLoad</h2>

+            asd <br>

+            dsfdsf <br>

+            sdf dsg <br>

+        </div>

+

+        <div class="block">

+            <h2 class="block-title">Community</h2>

+            asd <br>

+            dsfdsf <br>

+            sdf dsg <br>

+        </div>

+

+        <div class="block">

+            <h2 class="block-title">Development</h2>

+            asd <br>

+            dsfdsf <br>

+            sdf dsg <br>

+        </div>

+

+    </div>

+

 </footer>

 <!-- end #footer -->

 </body>