Minor fixes & improvements

diff --git a/cloudcms/static/cloudcms/css/forms.css b/cloudcms/static/cloudcms/css/forms.css
index aae5aea..9f98162 100644 (file)
--- a/cloudcms/static/cloudcms/css/forms.css
+++ b/cloudcms/static/cloudcms/css/forms.css
@@ -21,8 +21,8 @@ form.login                                                                    { margin-bottom: 22px; width:340px; }
 form h2 span                                                           { padding-bottom: 3px; }\r
 form .form-row                                                                 { min-height: 30px; position: relative;}\r
 form .form-row.submit                                          { margin: 22px 0 ;}\r
-form .form-row .extra-link                                     { color: #808080; text-decoration: none; border: none; margin-top:15px; line-height:42px;   float: right; }\r
-form .form-row .extra-link:hover                       { text-decoration:underline;}\r
+form .form-row .extra-link                                     { color: #808080; text-decoration: none; border: none; margin-top:15px; line-height:98%; display:inline-block; padding-top:15px;   float: right; }\r
+form .form-row .extra-link:hover                       { border-bottom:1px solid #808080;}\r
 form .form-row label                                           { font-size: 1.1em; }\r
 form.innerlabels label                                                 { position: absolute; top: 12px; left: 1.5em; color: #808080 ; }\r
 form.innerlabels p                                                     { margin:0; position: relative;}\r
@@ -30,7 +30,7 @@ form.innerlabels p.p15px                                      { font-size:1.154em;}
 form.innerlabels p.p15px a                                     { margin:0 5px;}\r
 form.innerlabels p.p15px a:hover                       { text-decoration:underline;}\r
 form.innerlabels a,\r
-form.innerlabels a:hover                                       { border:0 none;}\r
+form.innerlabels a:hover                                       { }\r
 form textarea,\r
 form input.text,\r
 form input[type="text"],\r
@@ -73,7 +73,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; top:10px;  left: 290px; }\r
+form span.info                                                         { position:absolute;z-index:10; bottom:32px;  }\r
+form.innerlabels span.info                                     { left: 290px; }\r
+form.withlabels span.info                                      { left: 440px; }\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
@@ -85,20 +87,44 @@ form input[readonly=true]                                   { /*background-color: #ddd;*/ color: #5e5e5e; }
 form.innerlabels .with-checkbox .checkbox-widget       { margin-top:15px; }\r
 form.innerlabels .with-checkbox .checkbox-label                { left:2.5em; top:17px; }\r
 \r
-form .extra-img                                                                { display:block; width:21px; height:21px; overflow:hidden;  position:absolute; left:440px; bottom:10px; z-index:101;}\r
+form .extra-img                                                                { display:block; width:21px; height:21px; overflow:hidden;  position:absolute; }\r
+form.withlabels .extra-img                                     { left:440px; bottom:12px; }\r
+form.innerlabels .extra-img                                    { bottom:10px; left:290px }\r
 form .with-checkbox .extra-img                         { top:20px; } \r
-form .with-errors .extra-img                           { background:url(../images/symbols.png) no-repeat -58px -3px;}\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
 form .with-errors input[type="text"],\r
 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;}\r
+form input[readonly="True"]+ span.extra-img { background:url(../images/symbols.png) no-repeat -111px -3px; z-index:101;}\r
 .errorlist                                                                     { margin:0; padding:0;}\r
 .errorlist li                                                          { list-style:none outside;}\r
- \r
-@media screen and (max-width : 583px)          { \r
-    form .extra-img    { left:222px; }\r
-    .form-error                { margin-left:0!important; } \r
+\r
+form .with-hidden                                                      { display:none; }\r
+\r
+\r
+/* custom captcha */\r
+#okeanos_recaptcha                                                             { width:331px; border:1px solid #808080; margin:20px 0; position:relative; }\r
+#okeanos_recaptcha #recaptcha_image                            { padding:15px 0; }\r
+#okeanos_recaptcha label.recaptcha_only_if_image,\r
+#okeanos_recaptcha label.recaptcha_only_if_audio{ position:absolute; top:auto; bottom:12px; }\r
+#okeanos_recaptcha a.recaptcha_audio_cant_hear_link { margin-left:20px;  }\r
+#okeanos_recaptcha #recaptcha_response_field   { width:220px; float:left; border-left:0 none;   }\r
+#okeanos_recaptcha .img                                                        { width:23px; float:left; height:23px; overflow:hidden; margin:8px; }\r
+#okeanos_recaptcha .img a                                              { display:block; width:100%; height:100%; background:url(../images/refresh_lg.png) no-repeat top left; text-indent:-100px }\r
+#okeanos_recaptcha .img-refresh        a                               { background:url(../images/refresh_lg.png); }\r
+#okeanos_recaptcha .img-refresh a:hover                        { background:url(../images/refresh_g.png); }\r
+#okeanos_recaptcha .img-audio  a                               { background:url(../images/sound_lg.png); }\r
+#okeanos_recaptcha .img-audio a:hover                  { background:url(../images/sound_g.png); }\r
+#okeanos_recaptcha .actions-wrap                               { border-top:1px solid #808080 }\r
+\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
+    \r
+    .form-error                               { margin-left:0!important; } \r
 \r
 }
\ No newline at end of file

diff --git a/cloudcms/static/cloudcms/css/ie7.css b/cloudcms/static/cloudcms/css/ie7.css
index d37c527..4c649fc 100644 (file)
--- a/cloudcms/static/cloudcms/css/ie7.css
+++ b/cloudcms/static/cloudcms/css/ie7.css
@@ -13,3 +13,5 @@ img                                                                                           { -ms-interpolation-mode:bicubic; }
 form input.text, \r
 form input[type="text"],\r
 form input[type="password"]                                            { margin-bottom:-3px;}\r
+#okeanos_recaptcha #recaptcha_response_field   { margin-bottom:-1px; }\r
+.container ul.options li a                                             { display:inline }\r

diff --git a/cloudcms/static/cloudcms/css/max768.css b/cloudcms/static/cloudcms/css/max768.css
index c4ed04e..fdb733f 100644 (file)
--- a/cloudcms/static/cloudcms/css/max768.css
+++ b/cloudcms/static/cloudcms/css/max768.css
@@ -4,4 +4,5 @@
 .bg-wrap                                                                               { background-position:-9999px -9999px; }
 .buttons-list.fixpos                                                   { position:static;  }
 .buttons-list .button                                                  { margin-left:0; }
-form input.submit, form input[type="submit"]   { margin:0; }
\ No newline at end of file
+form input.submit, form input[type="submit"]   { margin:0; }
+.container .lt-div                                                             { float:none; width:auto; }

diff --git a/cloudcms/static/cloudcms/css/modules.css b/cloudcms/static/cloudcms/css/modules.css
index 098ab0e..b902ced 100644 (file)
--- a/cloudcms/static/cloudcms/css/modules.css
+++ b/cloudcms/static/cloudcms/css/modules.css
@@ -20,9 +20,10 @@ img.right                                                            { margin:0 0 1em 1em; float:right;}
 \r
 \r
 /*top message*/\r
-.top-msg                                           { margin:-36px -70px 36px; background:blue; padding:100px 200px; color:#fff; display:none; position:relative; font-size:1.538em;}\r
-.top-msg  p.title                                  { font-size:1.3em;  }\r
-.top-msg  p.title span                         { border-bottom:2px dotted #fff; padding:0 0 10px 0;}\r
+.top-msg                                           { margin:-36px -70px 36px; background:blue; padding:100px; color:#fff; display:none; position:relative; font-size:1.538em; }\r
+.top-msg p                                                                             { text-align:center; }\r
+.top-msg p.title                                   { font-size:1.3em;  }\r
+.top-msg p.title span                          { border-bottom:2px dotted #fff; padding:0 0 10px 0;}\r
 .top-msg.active                                { display:block;}\r
 .top-msg +.mainlogo                             { margin-top:-73px;}\r
 .top-msg .close                                 { position:absolute; bottom:20px; right:20px; font-size:1.3em; font-weight:bold; border:0 none; color:#fff; text-decoration:none;}\r
@@ -115,16 +116,19 @@ a.videolink:hover                                         { background:url(../images/video_image.png)
 \r
 \r
 /* resources*/\r
-.resources .categories .clear                  { color: #000000; position:relative; top:-1px;}\r
+.resources .categories .clear                  { color: #000000; position:relative; top:-1px; line-height:100%; display:inline-block;}\r
+.resources .categories .clear:hover                            { border-bottom:1px solid #000; }\r
 .resources  a, .resources  a:hover              { border:0 none;}\r
 .resources .categories ul                          { margin:0;padding:0;}\r
 .resources .categories ul li                    { float: left; list-style:none outside;}\r
 .resources .categories .title                   { margin-bottom: 0.5em; }\r
 .resources .categories ul li a                  { color: #000000;   margin-right: 22px; text-decoration: none; }\r
 .resources .categories ul li a:hover, \r
-.resources .categories ul li a.selected         { color: #000000 }\r
+.resources .categories ul li a.selected         { color: #000000;}\r
+.resources .categories ul li.resource-cat-1.active a   { border-bottom: 1px solid #F89A1C; }\r
+.resources .categories ul li.resource-cat-2.active a   { border-bottom: 1px solid #4085A5 }\r
 .resources .categories ul li.inactive           { opacity: 0.3; }\r
-.resources .categories ul li.active             { font-weight: bold; opacity: 1; }\r
+.resources .categories ul li.active             { opacity: 1; }\r
 .resources .list                                { line-height: 1em; margin-top: 60px; position: relative; margin-right:-35px; }\r
 .resources .list .resource-wrapper.first .resource      { margin-left: 0; }\r
 .resources .list .resource-wrapper              { float: left; height: 250px; margin-bottom: 22px; margin-right: 35px; overflow: hidden; position: relative; width: 250px; }\r
@@ -149,14 +153,17 @@ a.videolink:hover                                         { background:url(../images/video_image.png)
 .resources .list .resource-cat-1.resource               { border-color: #4085A5  }\r
 .resources .list .resource-cat-1.resource .title        { color: #4085A5 }\r
 .resources .list .resource-cat-1.resource .description  { background-color: #4085A5 }\r
-.resources   .resource-cat-1.filter-item a              { color: #4085A5  }\r
+.resources  .resource-cat-1.filter-item a               { color: #4085A5  }\r
+.resources  .filter-item a                                                             { display:inline-block; line-height:100%; }\r
+.resources   .resource-cat-1.filter-item a:hover        { border-bottom:1px solid #F89A1C;  }\r
+.resources   .resource-cat-2.filter-item a:hover        { border-bottom:1px solid #4085A5;  }\r
 .resources .list .resource-cat-2.resource               { border-color: #FF6F00  }\r
 .resources .list .resource-cat-2.resource .title        { color: #FF6F00  }\r
 .resources .list .resource-cat-2.resource .description  { background-color: #FF6F00  }\r
 .resources  .resource-cat-2.filter-item a               { color: #FF6F00  }\r
 \r
 table                                                                                  { width:80%; color:#B3B3B3;}\r
-table th, table td                                                             { padding:5px 5px 5px 0;  }\r
+table th, table td                                                             { padding:5px 5px 5px 0;  }1234\r
 /*table td                                                                             { border-top: 1px solid #DDDDDD; }*/\r
 table th                                        { color:#222; font-weight:normal;}\r
 table td.consumed                                                              { color: #9D261D; }\r
@@ -164,7 +171,7 @@ table td.consumed                                                           { color: #9D261D; }
 /*.zebra-striped tbody tr:nth-child(2n+1) td, \r
 .zebra-striped tbody tr:nth-child(2n+1) th             { background-color: #F9F9F9; }*/\r
 .zebra-striped tbody tr:hover td, \r
-.zebra-striped tbody tr:hover th                               { background-color: #F5F5F5; }\r
+.zebra-striped tbody tr:hover th                               { color:#000; }\r
 \r
 .buttons-list.fixpos                                                   { position:absolute; bottom:0; right:0; }\r
 .button.back.right                                                             { right: 0; }\r
@@ -175,9 +182,19 @@ a.button                                                                           { border:0 none;  color: #FFFFFF;  display: inline-block;  te
 a.button:hover                                                                 { background-color: #F89A1C; border:0 none; color:#fff;}*/\r
 \r
 /*pagination*/\r
-.pagination a                                   { border:0 none;}\r
 .pagination .next-prev                          { float:left; }\r
 .pagination .nums                               { text-align:right;}\r
 .pagination .nums span                          { color:#F89A1C;}\r
                     \r
-.two-cols .lt .clients-wrapper p                               { padding:0; }
\ No newline at end of file
+.two-cols .lt .clients-wrapper p                               { padding:0; }\r
+\r
+\r
+/* colors for links */\r
+.container ul.options li a                                             { display:inline-block; line-height:100%; }\r
+.container ul.options li a:hover                               { text-decoration: none; }\r
+.container ul.options li a.red                                 { color:#F24E53 }\r
+.container ul.options li a.red:hover                   { border-bottom:1px solid #F24E53; }\r
+.container ul.options li a.grey                                        { color:#aaa }\r
+.container ul.options li a.grey:hover                  { border-bottom:1px solid #aaa; }\r
+.container ul.options li a.blue                                        { color:#00A2B1 }\r
+.container ul.options li a.blue:hover                  { border-bottom:1px solid #00A2B1; }
\ No newline at end of file

diff --git a/cloudcms/static/cloudcms/js/os.js b/cloudcms/static/cloudcms/js/os.js
index ee556a8..5524c65 100644 (file)
--- a/cloudcms/static/cloudcms/js/os.js
+++ b/cloudcms/static/cloudcms/js/os.js
@@ -107,6 +107,11 @@ var BrowserDetect = {
                           subString: "iPhone",\r
                           identity: "iPhone"\r
            },\r
+           {\r
+                          string: navigator.userAgent,\r
+                          subString: "iPad",\r
+                          identity: "iPad"\r
+           },\r
                {\r
                        string: navigator.platform,\r
                        subString: "Linux",\r

diff --git a/cloudcmsfaq/templates/cloudcmsfaq/archive.html b/cloudcmsfaq/templates/cloudcmsfaq/archive.html
index c640948..9230a9f 100644 (file)
--- a/cloudcmsfaq/templates/cloudcmsfaq/archive.html
+++ b/cloudcmsfaq/templates/cloudcmsfaq/archive.html
@@ -3,7 +3,7 @@
 <div class="faq">
     {% for category in categories %}
     <div class="faq-category">
-        <h3>{{ category.translation.title }}</h3>
+        <h2>{{ category.translation.title|upper }}</h2>
         <ul>
             {% for q in category.faqs.active %}
             <li {% if q == question %}class="current"{% endif %}>

diff --git a/cloudcmsresources/templates/content/resources_list.html b/cloudcmsresources/templates/content/resources_list.html
index 6c61ff9..5d4104d 100644 (file)
--- a/cloudcmsresources/templates/content/resources_list.html
+++ b/cloudcmsresources/templates/content/resources_list.html
@@ -15,11 +15,11 @@
         <ul>
             {% for cat in categories %}
             <li class="{{ cat.get_css_class }} filter-item" data-id="{{ cat.pk }}">
-                <a href="#{{ cat.pk }}">{{ cat.translation.title|upper }}</a>
+                <a href="#{{ cat.pk }}">{{ cat.translation.title }}</a>
             </li>
             {% endfor %}
         </ul>
-        <a href="#" class="clear">show all</a>
+        <a href="#" class="clear">Show all</a>
     </div>
 
     <div class="list">