New font (Open Sans)

diff --git a/cloudcms/static/cloudcms/css/formating.css b/cloudcms/static/cloudcms/css/formating.css
index 8b80148..e49a712 100644 (file)
--- a/cloudcms/static/cloudcms/css/formating.css
+++ b/cloudcms/static/cloudcms/css/formating.css
@@ -29,7 +29,7 @@ a img, :link img, :visited img                                        { border:none; }
 a span                                                                                 { cursor:pointer; }\r
 abbr[title], dfn[title]                                                        { border-bottom:1px dotted; cursor:help; }\r
 address                                                                                        { font-style:italic; margin:0 0 1.5em 0; }\r
-body                                                                                   { background:white; color:#222; font-family: 'Didact Gothic', Verdana, sans-serif;  font-style:normal; font-size:81.3%; line-height:1.5; text-align:left; letter-spacing:1px;}\r
+body                                                                                   { background:white; color:#222; font-family: 'Open Sans', sans-serif; font-style:normal; font-size:81.3%; line-height:1.5; text-align:left; letter-spacing:1px;}\r
 code, kbd, pre, samp                                                   { font-family:monospace, sans-serif; }\r
 del                                                                                            { text-decoration:line-through; }\r
 dl                                                                                             { margin:1em 0; }\r

diff --git a/cloudcms/static/cloudcms/css/forms.css b/cloudcms/static/cloudcms/css/forms.css
index 1c8f662..dc5947a 100644 (file)
--- a/cloudcms/static/cloudcms/css/forms.css
+++ b/cloudcms/static/cloudcms/css/forms.css
@@ -7,10 +7,11 @@ input, textarea, .form-widget                                 { background-color: #ffffff; color: #000;borde
 #forms input:focus label                                       { z-index: 300; }\r
 form.withlabels label                                          { width: 224px; display: block; float: left; padding-top: 1em; }\r
 form.withlabels input[type=text], \r
-form.withlabels input[type=password]           { width: 240px; }\r
+form.withlabels input[type=password]           { width: 270px; }\r
 form.withlabels input[type=text].long, \r
 form.withlabels input[type=password].long, \r
 form.withlabels textarea.long                          { width: 224px; }\r
+form.withlabels textarea                                       { width:270px; }\r
 .login-section a.button                                        { margin-bottom: 12px; }\r
 .login-section a.button:last-child                     { margin-bottom: none;}\r
 .login-section a.button.withicon                       { background-repeat: no-repeat; background-position: 15px 50%; padding-left: 40px; }\r
@@ -33,7 +34,7 @@ form textarea,
 form input.text,\r
 form input[type="text"],\r
 form input[type="password"]                            { color:#808080; font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px;border: 1px solid #808080; height: 21px; display: inline-block; margin-bottom: -1px; padding: 0.8em; padding-left: 1.5em; z-index: 2; width:300px; }\r
-form select                                                                    { font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px;  border: 1px solid #808080; display:block;  margin-bottom: -1px; padding: 0.8em;  padding-left: 1.5em;  z-index: 2;  width:331px; }\r
+form select                                                                    { font-family: 'Didact Gothic', Verdana, sans-serif; font-weight: normal; line-height: 22px; letter-spacing: 1px;  border: 1px solid #808080; display:block;  margin-bottom: -1px; padding: 0.8em;  padding-left: 1.5em;  z-index: 2;  width:301px; }\r
 form textarea:focus,\r
 form input.text:focus,\r
 form input[type="text"]:focus,\r
@@ -44,12 +45,12 @@ form input[type="text"]:focus label,
 form input[type="password"]:focus label        { z-index: 300;}\r
 form input.submit, \r
 form input[type="submit"],\r
-a.submit                                                                       { font-family: 'Didact Gothic', Verdana, sans-serif; font-size: 14px; font-weight: normal; line-height: 22px; letter-spacing:1px;  background-color: #f89a1c;color: #ffffff; border: none; padding: 10px 22px;font-size: 1em; margin:15px 0 0 223px; height:43px; }\r
+a.submit                                                                       { font-family: 'Open Sans', sans-serif; font-size: 14px; font-weight: normal; line-height: 22px; letter-spacing:1px;  background-color: #f89a1c;color: #ffffff; border: none; padding: 10px 22px;font-size: 1em; margin:15px 0 0 223px; height:43px; }\r
 form.innerlabels input.submit, \r
 form.innerlabels input[type="submit"]          {margin-left:0;}\r
 form input.submit:hover, \r
 form input[type="submit"]:hover,\r
-a.submit:hover                                                         { background-color:#3582AC;border-color:#3582ac; text-decoration:none;}\r
+.content a.submit:hover                                                { background-color:#3582AC;border-color:#3582ac; text-decoration:none;}\r
 form input.submit.back, \r
 form input[type="submit"].back                                 { text-decoration: none; bottom: 0; float: right; z-index: 500; }\r
 form input.submit.back.right, \r
@@ -71,9 +72,9 @@ div.form-stacked                                                      { margin-bottom: 4em; }
 form.withlabels .checkbox-widget                       { margin-top:20px; }\r
 form.innerlabels .checkbox-widget +  label     { position:static; line-height:36px; color:#808080; }\r
 form.innerlabels .checkbox-widget +  label + a { border-bottom:1px solid #F89A1C; font-size: 1.1em; }\r
-form span.info                                                         { position:absolute;z-index:10; bottom:32px;  }\r
+form span.info                                                         { position:absolute;z-index:101; bottom:32px;  }\r
 form.innerlabels span.info                                     { left: 290px; }\r
-form.withlabels span.info                                      { left: 440px; }\r
+form.withlabels span.info                                      { left:485px;  }\r
 form span.info em                                                      { display:block; overflow:hidden;  position:absolute; left:0; text-indent:-100px; top:0; height:21px; width:21px; background:url(../images/symbols.png) no-repeat -4px -31px;cursor:pointer; }\r
 form span.info:hover em                                        { background-position:-4px -3px; }\r
 form span.info span                                            { position:absolute; left:29px; top:-2px; width:120px; padding-left:30px; background:url(../images/black-line.jpg ) no-repeat left 12px; min-height:50px; display:none; font-size:0.846em;}\r
@@ -87,9 +88,9 @@ form.innerlabels .with-checkbox .checkbox-label               { left:2.5em; top:17px; }
 form.withlabels .with-checkbox .checkbox-widget                { position:absolute; left:224px; top:0; }\r
 \r
 form .extra-img                                                                { display:block; width:21px; height:21px; overflow:hidden;  position:absolute; }\r
-form.withlabels .extra-img                                     { left:460px; bottom:12px; }\r
+form.withlabels .extra-img                                     { left:485px; bottom:12px; }\r
 form.innerlabels .extra-img                                    { bottom:10px; left:290px }\r
-form .with-checkbox .extra-img                         { top:20px; } \r
+form .with-checkbox .extra-img                         {   } \r
 form .with-errors .extra-img                           { background:url(../images/symbols.png) no-repeat -58px -3px;  z-index:101;}\r
 form .with-errors textarea+.extra-img,\r
 form .with-errors noscript+.extra-img          { background:transparent;}\r
@@ -97,6 +98,7 @@ form .with-errors input[type="text"],
 form .with-errors input[type="password"]       { border:1px solid red;}\r
 form.innerlabels .with-errors .extra-img       { left:290px;}\r
 form input[readonly="True"]+ span.extra-img { background:url(../images/symbols.png) no-repeat -111px -3px; z-index:101;}\r
+form.withlabels .with-checkbox .extra-img      { display:none; } \r
 .errorlist                                                                     { margin:0; padding:0;}\r
 .errorlist li                                                          { list-style:none outside;}\r
 \r
@@ -119,24 +121,67 @@ form .with-hidden                                                 { display:none; }
 #okeanos_recaptcha .actions-wrap                               { border-top:1px solid #808080 }\r
 \r
 input.submit:focus,\r
-input[type="submit"]:focus                                             { box-shadow: 0 0 0 1px #FFFFFF inset; border:1px solid #F89A1C; outline:0 none; }                                              \r
+input[type="submit"]:focus,\r
+.content a.submit:focus                                                        { box-shadow: 0 0 0 1px #FFFFFF inset; border:1px solid #F89A1C; outline:0 none; }                                              \r
+.content a.submit:hover                                                        { border-color:#3582AC; }\r
 \r
-@media screen and (max-width : 591px)          { \r
-       form.withlabels .extra-img                                      { left:222px; }\r
-    form.withlabels span.info                                  { left:222px; }\r
-    form .extra-img                                            { left:222px; }\r
+p+ form                                                                                        { margin:2em 0; }\r
+.full-dotted legend                                                            { padding-top:40px; }\r
+form .form-row .radios label                                   { width:auto; float:none; display:inline-block; }\r
+form .form-row .radios input[type="radio"]             { margin-right:165px; vertical-align:middle; }\r
+form.withfieldset textarea                                             { width: 224px; }\r
+form.withfieldset select                                               { width: 256px; background:#fff;}\r
+form+p:first-child, form legend + p                            { margin-bottom:2em; }\r
+\r
+/* dropkick select extra styles */\r
+\r
+.form-row .dk_container                                                        { border-radius:0; margin-bottom:0; border: 1px solid #808080; height: 21px; letter-spacing: 1px; line-height: 22px; margin-bottom: -1px; width:300px; padding:0.8em 0; font-weight:normal; font-family: 'Didact Gothic', Verdana, sans-serif; font-size:1em; background:transparent; color:#808080;}\r
+.form-row .dk_toggle                                                   { border-radius:0;  padding:2px 0 10px;  border:0 none; text-indent:1.5em; text-decoration:none;background-image:url(../images/arrow-down_black.png); background-position:90% 5px;}\r
+.form-row .dk_toggle:hover                                             { text-decoration:none; }\r
+.form-row .dk_open                                                             { background:transparent; box-shadow: none; }\r
+.form-row .dk_open .dk_toggle                                  { background-color:transparent; border:0 none; color:#000; box-shadow: none;}\r
+.form-row .dk_focus .dk_toggle                                 { background-color:transparent;  border:0 none; color:#000; box-shadow: none;}\r
+.1form-row .dk_options                                                 { display:block; }\r
+.form-row .dk_options                                                  { box-shadow:none; border-radius:0; z-index:3; margin:6px -1px 0; width:auto; left:0;}\r
+.form-row .dk_options a                                                        { font-weight:normal;color:#808080 }\r
+.form-row .dk_options_inner                                            { padding:0; margin:0; box-shadow:none; text-shadow:none;  border-radius:0; border:1px solid #8C8C8E ;}\r
+.form-row .dk-options_inner li                                 { list-style:none outside; }\r
+.form-row .dk_options a:hover, \r
+.form-row .dk_option_current a                                 { text-shadow:none; background-color: #E7E7E3; text-decoration:none;}\r
+\r
+form.link-like                                                                 { display:inline-block; margin:0 5px; }\r
+form.link-like input[type="submit"]                            { margin:0; padding:0 5px; background:transparent; color:#F89A1C; cursor:pointer; height:auto;  }\r
+form.link-like input[type="submit"]:hover              { text-decoration:underline;  }\r
+.projects form.withlabels .checkbox-widget             { margin-top:5px; }\r
+.projects form .with-checkbox                                  { margin:20px 0; }\r
+.projects form .with-checkbox label                            { padding-top:7px; }\r
+.projects form .with-checkbox span.info                        { bottom:24px; }\r
+\r
+\r
+@media screen and (max-width : 630px)          { \r
+       form.withlabels .extra-img                                      { left:260px; }\r
+    form.withlabels span.info                                  { left:260px; }\r
+    form .extra-img                                            { left:260px; }\r
     .form-error                                                        { margin-left:0!important; } \r
     \r
 }\r
 \r
 \r
 @media screen and (max-width : 410px)          { \r
+       form.withlabels .extra-img                                      { left:90% }    \r
        form.login                                                                      { width:auto; }\r
        form textarea, \r
        form input.text, \r
        form input[type="text"], \r
        form input[type="password"]                             { width:90%; }\r
-       form.withlabels select                                                                  { width:90%; }\r
+       form.withlabels input[type="text"], \r
+    form.withlabels input[type="password"],\r
+    form.withlabels textarea,\r
+    form textarea, \r
+       form input.text, \r
+       form input[type="text"], \r
+       form input[type="password"]                                     { width:90%; }\r
+       form.withlabels select                                          { width:90%; }\r
        form.innerlabels .extra-img,\r
        form.innerlabels .with-errors .extra-img        { left:90%; }\r
        form.innerlabels                                                        { width:auto; }\r
@@ -148,31 +193,14 @@ input[type="submit"]:focus                                                { box-shadow: 0 0 0 1px #FFFFFF inset; border:1p
 }\r
 \r
 \r
-@media screen and ( width : 320px)             { \r
+@media screen and ( max-width : 320px)                 { \r
        #okeanos_recaptcha                                                      { width:259px }\r
-    \r
-}\r
-\r
-p+ form                                                                                        { margin:2em 0; }\r
-.full-dotted legend                                                            { padding-top:40px; }\r
-form .form-row .radios label                                   { width:auto; float:none; display:inline-block; }\r
-form .form-row .radios input[type="radio"]             { margin-right:165px; vertical-align:middle; }\r
-form.withfieldset textarea                                             { width: 224px; }\r
-form.withfieldset select                                               { width: 256px; background:#fff;}\r
-form+p:first-child, form legend + p                            { margin-bottom:2em; }\r
-\r
-/* dropkick select extra styles */\r
-\r
-.form-row .dk_container                                                        { border-radius:0; margin-bottom:0; border: 1px solid #808080; height: 21px; letter-spacing: 1px; line-height: 22px; margin-bottom: -1px; width:254px; padding:0.8em 0; font-weight:normal; font-family: 'Didact Gothic', Verdana, sans-serif; font-size:1em; background:transparent; color:#808080;}\r
-.form-row .dk_toggle                                                   { border-radius:0;  padding:7px 0;  border:0 none; text-indent:1.5em; text-decoration:none;background-image:url(../images/arrow_02.jpg); background-position:90% 5px;}\r
-.form-row .dk_toggle:hover                                             { text-decoration:none; }\r
-.form-row .dk_open                                                             { background:transparent; box-shadow: none; }\r
-.form-row .dk_open .dk_toggle                                  { background-color:transparent; border:0 none; color:#000; box-shadow: none;}\r
-.form-row .dk_focus .dk_toggle                                 { background-color:transparent;  border:0 none; color:#000; box-shadow: none;}\r
-.1form-row .dk_options                                                 { display:block; }\r
-.form-row .dk_options                                                  { box-shadow:none; border-radius:0; z-index:3; margin:6px -1px 0; width:auto; left:0;}\r
-.form-row .dk_options a                                                        { font-weight:normal;color:#808080 }\r
-.form-row .dk_options_inner                                            { padding:0; margin:0; box-shadow:none; text-shadow:none;  border-radius:0; border:1px solid #8C8C8E ;}\r
-.form-row .dk-options_inner li                                 { list-style:none outside; }\r
-.form-row .dk_options a:hover, \r
-.form-row .dk_option_current a                                 { text-shadow:none; background-color: #E7E7E3;}
\ No newline at end of file
+    form.withlabels input[type="text"], \r
+    form.withlabels input[type="password"],\r
+    form.withlabels textarea,\r
+    form textarea, \r
+       form input.text, \r
+       form input[type="text"], \r
+       form input[type="password"]                                     { width:90%; }\r
+       .form-row .dk_container                                         { width:100%; }\r
+}
\ No newline at end of file

diff --git a/cloudcms/static/cloudcms/js/forms.js b/cloudcms/static/cloudcms/js/forms.js
index 3321aef..edae5dc 100644 (file)
--- a/cloudcms/static/cloudcms/js/forms.js
+++ b/cloudcms/static/cloudcms/js/forms.js
@@ -3,21 +3,48 @@
   $.fn.formCheckBoxes = function(options) {\r
     \r
     return this.each(function() {\r
+      // process checkboxes\r
       var $this = $(this);\r
-      var el = $('<span class="checkbox-widget" />');\r
-    \r
+      var el = $('<a class="checkbox-widget" href="javascript:void(0)"/>');\r
+      var form = $this.closest(".form-row");\r
+\r
+      // add class to identify form rows which contain a checkbox\r
+      form.addClass("with-checkbox");\r
+      \r
+      if ($this.prev().length > 0) {\r
+        var lbl = $this.prev()[0];\r
+        if (lbl.nodeName == "LABEL" || lbl.nodeName == "label") {\r
+            $(lbl).addClass("checkbox-label");\r
+\r
+            $(lbl).click(function(e){\r
+                var src = e.srcElement.nodeName;\r
+                if (src == "LABEL" || src == "label") {\r
+                    el.toggleClass("checked");\r
+                };\r
+            })\r
+        }\r
+      }\r
       $this.hide();\r
       \r
-      if ($this.is("checked")) {\r
+      if ($this.attr('checked')) {\r
         el.addClass("checked");  \r
       }\r
 \r
       el.click(function() {\r
         el.toggleClass("checked");\r
         $this.attr('checked', el.hasClass("checked"));\r
+      });\r
+      \r
+      el.keypress(function(e){\r
+       \r
+       if (e.keyCode == 0 || e.keyCode == 32){\r
+               e.preventDefault();\r
+               el.toggleClass("checked");\r
+               $this.attr('checked', el.hasClass("checked"));\r
+       }\r
       })\r
 \r
-      $this.after(el);\r
+      $this.prev('label').before(el);\r
     });\r
 \r
 \r
@@ -68,8 +95,13 @@
             marginLeft: marginleft,\r
             marginBottom: 5\r
         }\r
-        el.css(styles);\r
+        \r
+        if (formel.attr("type") != "checkbox") {\r
+            el.css(styles);\r
+        } else {\r
+            el.css("margin-top", "5px");\r
+        }\r
     });\r
 \r
   };\r
-})( jQuery );
\ No newline at end of file
+})( jQuery );\r

diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html
index 7be5028..7a9a912 100644 (file)
--- a/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@ -15,7 +15,8 @@
   {% endblock favicons %}
 
   {% block css %}
-      <link href='http://fonts.googleapis.com/css?family=Didact+Gothic&subset=latin' rel='stylesheet' type='text/css'>
+      
+      <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,600,700&subset=latin,greek-ext,greek' rel='stylesheet' type='text/css'>
       <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}cloudcms/css/global.css">
       <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}cloudcms/css/print.css" media="print">
       <!--[if lte IE 7]>
@@ -36,6 +37,7 @@
       <script src="{{ MEDIA_URL }}cloudcms/js/common.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/forms.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/os.js"></script>
+      <script src="{{ IM_STATIC_URL }}js/jquery.tablesorter.js"></script>
       <script src="{{ MEDIA_URL }}cloudcms/js/resources_list.js"></script> 
   {% endblock headjs %}