Bug fixes and improvements
authorOlga Brani <olgabrani@grnet.gr>
Tue, 15 May 2012 11:39:50 +0000 (14:39 +0300)
committerOlga Brani <olgabrani@grnet.gr>
Tue, 15 May 2012 11:39:50 +0000 (14:39 +0300)
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
snf-astakos-app/astakos/im/static/im/css/forms.css
snf-astakos-app/astakos/im/static/im/css/modules.css
snf-astakos-app/astakos/im/static/im/images/arrow-white.png [new file with mode: 0644]
snf-astakos-app/astakos/im/static/im/images/symbols.png [new file with mode: 0644]
snf-astakos-app/astakos/im/static/im/js/common.js
snf-astakos-app/astakos/im/static/im/js/os.js
snf-astakos-app/astakos/im/templates/im/base.html
snf-astakos-app/astakos/im/templates/im/form_render.html
snf-astakos-app/astakos/im/templates/im/invitations.html
snf-astakos-app/astakos/im/templates/im/login_base.html

index c936146..496d11f 100644 (file)
@@ -71,6 +71,7 @@ $(document).ready(function(){
             if (i == 0){
                 username.text(el.name);
                 username.attr('href', el.url);
+                user.removeClass('full');
             }else{
                 var link = $("<a />");
                 link.text(el.name);
@@ -78,6 +79,7 @@ $(document).ready(function(){
                 var li = $("<li />");
                 li.append(link);
                 usermenu.append(li);
+                user.addClass('full');
             }
         });
     });
@@ -97,4 +99,20 @@ $(document).ready(function(){
 
     // ie fix
     user.hover(function(){$(this).addClass("hover")}, function(){$(this).removeClass("hover")});
+    
+    $('.header .profile ul').mouseover(function(){
+        $(this).parents('.profile').css('backgroundColor','#000');
+        
+    });
+     $('.header .profile ul').mouseout(function(){
+        $(this).parents('.profile').css('backgroundColor','#01A1AE');
+        
+    });
+    
+    var profileWidth = profile.outerWidth(); 
+    $('.header .profile ul').css('width',profileWidth );
+
+    
+    
+    
 });
index 5b1adc3..8796b19 100644 (file)
 /* generic form styles */\r
-input, textarea, .form-widget {\r
-  background-color: #ffffff;\r
-  color: #000;\r
-  border-color: #000000;\r
-}\r
-#forms .input, #forms input {\r
-  font-family: 'Antic', sans-serif;\r
-  font-size: 14px;\r
-  font-weight: normal;\r
-  line-height: 22px;\r
-  letter-spacing: 1px;\r
-  border: 1px solid #808080;\r
-  height: 21px;\r
-  display: inline-block;\r
-  margin-bottom: -1px;\r
-  padding: 0.8em;\r
-  padding-left: 1.5em;\r
-  z-index: 2;\r
-}\r
-#forms .input:focus, #forms input:focus {\r
-  position: relative;\r
-  border: 1px solid #000;\r
-  z-index: 100;\r
-}\r
-#forms .input:focus label, #forms input:focus label {\r
-  z-index: 300;\r
-}\r
-.altcol {\r
-  background-color: #c3c3b9 !important;\r
-}\r
-.altcol:hover {\r
-  background-color: #f89a1c !important;\r
-}\r
-\r
-form.withlabels label {\r
-  width: 224px;\r
-  display: block;\r
-  float: left;\r
-  padding-top: 1em;\r
-}\r
-form.withlabels input[type=text], form.withlabels input[type=password] {\r
-  width: 224px;\r
-}\r
-form.withlabels input[type=text].long, form.withlabels input[type=password].long, form.withlabels textarea.long {\r
-  width: 224px;\r
-}\r
-.login-section a.button {\r
-  margin-bottom: 12px;\r
-}\r
-.login-section a.button:last-child {\r
-  margin-bottom: none;\r
-}\r
-.login-section a.button.withicon {\r
-  background-repeat: no-repeat;\r
-  background-position: 15px 50%;\r
-  padding-left: 40px;\r
-}\r
-.login-section.loggedin {\r
-  padding-bottom: 0 !important;\r
-  background-image: none !important;\r
-}\r
-form.login {\r
-  margin-bottom: 22px;\r
-  width:340px;\r
-}\r
-\r
-form h2 span {\r
-  padding-bottom: 3px;\r
-}\r
-form .form-row {\r
-  min-height: 29.333333333333332px;\r
-  position: relative;\r
-}\r
-form .form-row.submit {\r
-  margin: 22px 0 ;\r
-}\r
-form .form-row .extra-link {\r
-  color: #808080;\r
-  text-decoration: none;\r
-  border: none;\r
\r
- line-height:42px;\r
-  float: right;\r
-}\r
-form .form-row .extra-link:hover       { text-decoration:underline;}\r
-form .form-row label {\r
-  font-size: 1.1em;\r
-}\r
-form.innerlabels label {\r
-  position: absolute;\r
-  top: 1.1em;\r
-  left: 1.5em;\r
-  color: #808080 ;\r
-}\r
-form.innerlabels p {\r
-  margin:0;\r
-  position: relative;\r
-}\r
-form.innerlabels p.p15px       { font-size:1.154em;}\r
-form.innerlabels p.p15px a     { margin:0 5px;}\r
-form.innerlabels p.p15px a:hover       { text-decoration:underline;}\r
+input, textarea, .form-widget                          { background-color: #ffffff; color: #000;border-color: #000000; }\r
+#forms .input, #forms input                            { font-family: 'Antic', sans-serif; font-size: 14px; 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; }\r
+#forms .input:focus, \r
+#forms input:focus                                                     { position: relative; border: 1px solid #000; z-index: 100; }\r
+#forms .input:focus label,\r
+#forms input:focus label                                       { z-index: 300; }\r
+.altcol                                                                        { background-color: #c3c3b9 !important; }\r
+.altcol:hover                                                          { background-color: #f89a1c !important; }\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: 224px; }\r
+form.withlabels input[type=text].long, \r
+form.withlabels input[type=password].long, \r
+form.withlabels textarea.long                          { width: 224px; }\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
+.login-section.loggedin                                        { padding-bottom: 0 !important; background-image: none !important; }\r
+form.login                                                                     { margin-bottom: 22px; width:340px; }\r
+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 label                                           { font-size: 1.1em; }\r
+form.innerlabels label                                                 { position: absolute; top: 1.1em; left: 1.5em; color: #808080 ; }\r
+form.innerlabels p                                                     { margin:0; position: relative;}\r
+form.innerlabels p.p15px                                       { font-size:1.154em;}\r
+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                                       { border:0 none;}\r
 form textarea,\r
 form input.text,\r
 form input[type="text"],\r
-form input[type="password"]  {\r
-  color:#808080; \r
-  font-family: 'Antic', sans-serif;\r
-  font-weight: normal;\r
-  line-height: 22px;\r
-  letter-spacing: 1px;\r
-  border: 1px solid #808080;\r
-  height: 21px;\r
-  display: inline-block;\r
-  margin-bottom: -1px;\r
-  padding: 0.8em;\r
-  padding-left: 1.5em;\r
-  z-index: 2;\r
-  width:300px;\r
-}\r
-\r
-form select    {\r
-       font-family: 'Antic', sans-serif;\r
-  font-weight: normal;\r
-  line-height: 22px;\r
-  letter-spacing: 1px;\r
-  border: 1px solid #808080;\r
-  display:block;\r
-  margin-bottom: -1px;\r
-  padding: 0.8em;\r
-  padding-left: 1.5em;\r
-  z-index: 2;\r
-  width:331px;\r
-}\r
+form input[type="password"]                            { color:#808080; font-family: 'Antic', 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: 'Antic', 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 textarea:focus,\r
 form input.text:focus,\r
 form input[type="text"]:focus,\r
-form input[type="password"]:focus {\r
-  position: relative;\r
-  border: 1px solid #000;\r
-  z-index: 100;\r
-}\r
+form input[type="password"]:focus                      {position: relative; border: 1px solid #000; z-index: 100;}\r
 form textarea:focus label,\r
 form input.text:focus label,\r
 form input[type="text"]:focus label,\r
-form input[type="password"]:focus label {\r
-  z-index: 300;\r
-}\r
-form input.submit, form input[type="submit"] {\r
-  font-family: 'Antic', sans-serif;\r
-  font-size: 14px;\r
-  font-weight: normal;\r
-  line-height: 22px;\r
-  letter-spacing:1px;\r
-  background-color: #3582ac;\r
-  color: #ffffff;\r
-  border: none;\r
-  padding: 10px 22px;\r
-  font-size: 1em;\r
-  \r
-}\r
-form input.submit:hover, form input[type="submit"]:hover {\r
-  background-color: #f89a1c;\r
-}\r
-form input.submit.back, form input[type="submit"].back {\r
-  text-decoration: none;\r
-  bottom: 0;\r
-  float: right;\r
-  z-index: 500;\r
-}\r
-form input.submit.back.right, form input[type="submit"].back.right {\r
-  right: 0;\r
-}\r
-form input.submit:hover, form input[type="submit"]:hover {\r
-  background-color: #f89a1c;\r
-}\r
-form input.submit.back, form input[type="submit"].back {\r
-  text-decoration: none;\r
-  bottom: 0;\r
-  float: right;\r
-  z-index: 500;\r
-}\r
-form input.submit.back.right, form input[type="submit"].back.right {\r
-  right: 0;\r
-}\r
-form textarea {\r
-  height: 150px;\r
-  width: 350px; \r
-  max-height:150px;\r
-  max-width:350px;\r
-}\r
-form .with-errors input, form .with-errors textarea, form .with-errors select {\r
-  color: #9d261d;\r
-}\r
-form .with-errors label {\r
-  color: #e4776f;\r
-}\r
-.form-error {\r
-  background-color: #9d261d;\r
-  color: #fff;\r
-  font-size: 0.8em;\r
-  padding: 5px 5px;\r
-}\r
-.form-errors.all .form-error {\r
-  position: relative;\r
-  border-radius: 0;\r
-  margin-bottom: 1.3em;\r
-  padding: 0.5em;\r
-}\r
-div.form-stacked {\r
-  margin-bottom: 4em;\r
-}\r
-\r
-.checkbox-widget.checked {\r
-    background-color: #FF0000;\r
-    background-image: url("../images/checkbox.png");\r
-    background-position: 50% 50%;\r
-}\r
-.checkbox-widget {\r
-    border: 1px solid #808080;\r
-    cursor: pointer;\r
-    display: block;\r
-    float: left;\r
-    height: 25px;\r
-    margin:5px 20px 0 0 ;\r
-    width: 25px;\r
-   \r
-}\r
-\r
-\r
-form.withlabels .checkbox-widget{\r
-       margin-top:20px;        \r
-}\r
-\r
-form.innerlabels .checkbox-widget +  label     {\r
-       position:static;\r
-       line-height:36px;\r
-       color:#808080;\r
-       \r
-}\r
-\r
-form.innerlabels .checkbox-widget +  label + a {\r
-       border-bottom:1px solid #F89A1C;\r
-       font-size: 1.1em;\r
-       \r
-}\r
-\r
-form span.info{\r
-    position:absolute;\r
-    z-index:10; \r
-    top:8px; \r
-    left: 260px;\r
-   \r
-}\r
-form span.info em {\r
-    display:block; \r
-    overflow:hidden;\r
-    position:absolute;\r
-    left:0; \r
-    text-indent:-100px;\r
-    top:0; \r
-    height:28px;\r
-    width:28px;\r
-    background:url(../images/question-mark.jpg) no-repeat left bottom;\r
-    cursor:pointer;       \r
-}\r
-\r
-form span.info:hover em {\r
-    background-position:left top;\r
-}\r
-\r
-form span.info span  {\r
-    position:relative; \r
-    left:42px;\r
-    top:2px;\r
-    width:150px;\r
-    padding-left:55px; \r
-    background:url(../images/black-line.jpg ) no-repeat left 12px;\r
-    min-height:50px;\r
-    display:none;\r
-    color:#b3b3b3;\r
-}\r
-\r
-form span.info span  a {\r
-       color:#b3b3b3;\r
-       border-bottom:1px solid #F89A1C;        \r
-}\r
-\r
-form span.info:hover span {\r
-    display:block;\r
-}\r
-\r
-form p {\r
-       margin-bottom:0;\r
-}\r
-\r
+form input[type="password"]:focus label        { z-index: 300;}\r
+form input.submit, \r
+form input[type="submit"]                                      {font-family: 'Antic', sans-serif;font-size: 14px; font-weight: normal; line-height: 22px; letter-spacing:1px; background-color: #3582ac; 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                        { background-color: #f89a1c;}\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
+form input[type="submit"].back.right           {right: 0;}\r
+form input.submit:hover, \r
+form input[type="submit"]:hover                        { background-color: #f89a1c;}\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
+form input[type="submit"].back.right           { right: 0; }\r
+form textarea                                                          { height: 150px; width: 350px; max-height:150px; max-width:350px;}\r
+form .with-errors input, \r
+form .with-errors textarea, \r
+form .with-errors select                                       { color: #9d261d;}\r
+form .with-errors label                                        { color: #e4776f; }\r
+.form-error                                                            { color:red; font-style:italic; font-size: 0.8em; padding: 5px 5px; }\r
+.form-errors.all .form-error                           { position: relative; border-radius: 0; margin-bottom: 1.3em; padding: 0.5em; }\r
+div.form-stacked                                                       { margin-bottom: 4em; }\r
+.checkbox-widget.checked                                       { background-color: #FF0000; background-image: url("../images/checkbox.png"); background-position: 50% 50%; }\r
+.checkbox-widget                                                       { border: 1px solid #808080; cursor: pointer; display: block; float: left; height: 25px; margin:5px 20px 0 0 ; width: 25px; }\r
+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 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:150px; padding-left:55px; background:url(../images/black-line.jpg ) no-repeat left 12px; min-height:50px; display:none; }\r
+form span.info:hover span                                      { display:block; }\r
+form .with-errors span.info                                    { display:none;}\r
+form p                                                                         { margin-bottom:0;position:relative;}\r
+form input[readonly=true]                                      { background-color: #ddd; color: #5e5e5e; }\r
+#recaptcha_area                                                        { margin-top:20px; } \r
+form.innerlabels .with-checkbox .checkbox-widget       { margin-top:15px; }\r
+form.innerlabels .with-checkbox .checkbox-label                { left:2.5em; }\r
+\r
+form .extra-img                                                                { display:block; width:21px; height:21px; overflow:hidden;  position:absolute; left:440px;top:10px; z-index:101;}\r
+form .with-errors .extra-img                           { background:url(../images/symbols.png) no-repeat -58px -3px;}\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
+.errorlist                                                                     { margin:0; padding:0;}\r
+.errorlist li                                                          { list-style:none outside;}\r
 \r
-form input[readonly=true] {\r
-  background-color: #ddd;\r
-  color: #5e5e5e;\r
-}\r
 \r
-#recaptcha_area {\r
-       margin-top:20px;\r
-}\r
\ No newline at end of file
index aaa2610..9bc091c 100644 (file)
@@ -10,17 +10,20 @@ img.right                                                           { margin:0 0 1em 1em; float:right;}
 .header                                         { background:#000; color:#fff;  height:35px; line-height:35px; }       \r
 .header .wrapper                                { width:auto; padding:0;}                      \r
 .header a                                       { color:#fff; text-decoration:none;}\r
-.header .profile                                { float:right; background:#01A1AE; width:150px; padding:0 20px; text-align:right;  }\r
+.header .profile                                { float:right; background:#01A1AE; min-width:150px; padding:0 20px; text-align:right;  }\r
 .header .profile a                              { text-decoration:none; color:#fff; }\r
-.header .profile ul                             { position:absolute; right:0; top:35px; padding:0; margin:0; background:#01A1AE; width:190px; display:none;    }\r
-.header .profile ul li                          { list-style:none outside; line-height:35px; border-top:1px solid #000; padding:0 20px;}\r
-.header .profile ul li:hover                                   { background:#000;}\r
+.header .profile ul                             { position:absolute;   right:0; top:35px; padding:0; margin:0;  width:190px; display:none;     z-index:9; background:#fff;}\r
+.header .profile ul li                          { list-style:none outside; line-height:35px; padding:0 20px;}\r
+.header .profile ul li:hover a                                 { color:#01A1AE;}\r
 .header .profile:hover ul                       { display:block; }\r
+.header .profile .full a                        { padding-right:20px; background:url(../images/arrow-white.png) no-repeat right center;}\r
+.header .profile .full ul                                              { border:1px dashed #000; border-top:0 none; border-right:0 none;}\r
+.header .profile ul li a                        { padding-right:0; background:none; color:#000;}\r
 .header ul.services                             { margin:0; padding:0; }\r
 .header ul.services li                          { float:left; height:35px; line-height:35px; text-align:center; padding: 0 30px; list-style:none outside;}\r
 .header ul.services li:first-child              { padding:0 5px;}\r
 .header ul.services li.active                   { background:#333;}\r
-.header ul.services li:hover                    { background:#444; }\r
+.header ul.services li:hover                    { background:#444; } \r
 \r
 \r
 /* footer */\r
@@ -36,24 +39,25 @@ img.right                                                           { margin:0 0 1em 1em; float:right;}
 \r
 \r
 /*top message*/\r
-.top-msg                                           { margin:-36px -70px 40px; background:blue; padding:100px 200px; color:#fff; display:none; position:relative; font-size:1.538em;}\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.active                                { display:block;}\r
-.active+h1                                         { display:none;}\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
+.top-msg .close:hover                           { color:#000;}\r
+\r
 \r
 /* container */\r
-.container h1                                                                  { margin:0; line-height:100%;}\r
 .container .wrapper                             { padding-bottom:100px;}\r
 .container .navigation                          { margin:20px 0 40px; font-size:1.231em;}\r
 .container .navigation ul                       { margin:5px 0; padding:0;}\r
 .container .navigation ul li                    { list-style:none outside; padding:0; margin:0 0 0 1em; display:inline-block;}\r
 .container .navigation ul li:first-child        { margin-left:0;}\r
 .container .navigation ul li a                  { color:#000; text-decoration:none; }\r
-.container .navigation ul li a:hover            { border-bottom:1px solid #F89A1C;}    \r
+.container .navigation ul li a:hover            { color:#F89A1C; }     \r
 .container .navigation ul li.active a           { color:#F89A1C; }                                     \r
-.dotted                                         { background:url(../images/double-dots.jpg) no-repeat bottom center; padding:30px 0; margin-bottom:30px;}\r
+.dotted                                         { background:url(../images/double-dots.jpg) no-repeat bottom center; padding:0 0 30px; margin-bottom:30px;}\r
 .two-cols .rt                                   { float:right; width:390px;}\r
 .two-cols .lt                                   { float:left; width:390px;}\r
 .two-cols .lt p                                 { padding-right:40px;}\r
@@ -69,27 +73,28 @@ img.right                                                           { margin:0 0 1em 1em; float:right;}
 .container ul.options li a:hover                               { text-decoration:underline;}\r
 .landing h2, .landing a:hover                   { color:#01A1AE;}\r
 .faq h2, .faq a:hover                           { color:#EF4F54; border:0 none;}\r
+.faq h3                                                                                        { color:#4085a6; margin:0;}\r
 .faq ul                                         { padding:0; margin:0; }\r
-.faq ul li                                      { list-style:none outside; padding:0 0 0 5px; margin:0;  }\r
+.faq ul li                                      { list-style:none outside; padding:0; margin:0;  }\r
 .faq ul li a                                    { color:#222222; border:0 none;} \r
+.faq .faq-category                                                             { margin: 0 0 1.5em;}\r
 .follow h3 a                                    { color:#4085A6;}\r
 .follow a                                                      { border:0 none;}\r
 .follow ul                                      { margin:0; padding:0;}\r
 .follow ul li                                   { list-style:none outside; padding:0; margin:0 0 20px 0; font-size:0.923em; color:#808080;}\r
 .follow ul li p.title                           { margin-bottom:0; color:#000;}\r
 .follow ul li p.title a                         { color:#000;}\r
-.follow ul li p a                               { color:#808080;}\r
+.follow ul li p a                               { color:#808080;}   \r
 .posts ul                                       { margin:0;padding:0; }\r
 .posts ul li                                    { padding:0; margin:0 0 50px; list-style:none outside; }\r
-.posts ul li .img-div                           { float:left; width:160px; margin-right:20px; }\r
-.posts ul li .img-div img                       { max-width:160px;}\r
-.posts ul li .img-div p                         { font-size:1.154em; color:#01A1AE;}\r
-.posts ul li .txt                               { overflow:hidden;} \r
-.posts ul li .txt h3                            { color:#F89A1C;}\r
-.posts ul li .txt h3 a                          { color:#F89A1C; border:0 none; }\r
-.posts ul li p.info                             { background:url(../images/blog-dots.jpg) no-repeat top; padding-top:10px; margin-top:20px; font-size:0.923em; color:#808080;}\r
-.article p.info                                                                { margin-top:20px; padding-top:10px; font-size:0.923em; color:#808080; border-top:1px dashed #ccc;}\r
-p.info a                                        { color:#808080; }\r
+.posts ul li img                                { max-width:580px; margin-bottom:1em;}\r
+.posts ul li p.info                             { padding-bottom:10px; margin-bottom:20px; font-size:0.923em; color:#808080; border-bottom:1px dashed #000;}\r
+.article p.info                                                                { margin-top:20px; padding-top:10px; font-size:0.923em; color:#808080; }\r
+.article h2, .posts h2                          { color:#ef4f53; }\r
+.posts h2 a, .posts h2 a:hover                  { border:0 none;color:#ef4f53;}\r
+.posts p.date, .article p.date                  { margin:0; font-size:1.231em; color:#01a1ae; }\r
+p.info a                                        { color:#808080; border-bottom:0 none; }\r
+p.info a:hover                                  { color:#000; border-bottom:0 none;}\r
 .bg-wrap                                        { background-position:right top; background-repeat:no-repeat;}\r
 .bg-wrap .extra                                 { display:none;}\r
 .bg-wrap.open .extra                            { display:block;}\r
@@ -120,11 +125,13 @@ a.btn_01, .box-more                             { width:80%; margin:0 auto 20px;
 a.videolink                                                        { border: 0 none; display:block; width:367px; height:207px; background:url(../images/video_image_hover.png) no-repeat; text-decoration:none;}\r
 a.videolink:hover                                              { background:url(../images/video_image.png)no-repeat; text-decoration:none; border:0 none;}\r
 .container .full                                                               { position:relative;}\r
-\r
+.container .bottom-bordered                     { border-bottom:1px dashed #000000;margin-bottom:20px }\r
+.container .lt-div                              { width:234px; float:left; }\r
+.container .overflow-hidden                     { overflow:hidden;}\r
 \r
 \r
 /* resources*/\r
-.resources .categories .clear                  { color: #000000; float: right; margin-right: 4px;}\r
+.resources .categories .clear                  { color: #000000; position:relative; top:-1px;}\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
@@ -164,13 +171,14 @@ a.videolink:hover                                         { background:url(../images/video_image.png)
 .resources .list .resource-cat-2.resource .description  { background-color: #FF6F00  }\r
 .resources  .resource-cat-2.filter-item a               { color: #FF6F00  }\r
 \r
-table                                                                                  { width:100%;}\r
-table th, table td                                                             { padding:10px;  }\r
-table td                                                                               { border-top: 1px solid #DDDDDD; }\r
+table                                                                                  { width:80%; color:#B3B3B3;}\r
+table th, table td                                                             { padding:5px 5px 5px 0;  }\r
+/*table td                                                                             { border-top: 1px solid #DDDDDD; }*/\r
+table th                                        { color:#222; font-weight:normal;}\r
 table td.consumed                                                              { color: #9D261D; }\r
 \r
-.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: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
 \r
@@ -187,4 +195,4 @@ a.button:hover                                                                      { background-color: #F89A1C; border:0 none; color:#fff;}
 .pagination .nums                               { text-align:right;}\r
 .pagination .nums span                          { color:#F89A1C;}\r
                     \r
-\r
+.two-cols .lt .clients-wrapper p                               { padding:0; }
\ No newline at end of file
diff --git a/snf-astakos-app/astakos/im/static/im/images/arrow-white.png b/snf-astakos-app/astakos/im/static/im/images/arrow-white.png
new file mode 100644 (file)
index 0000000..3f04453
Binary files /dev/null and b/snf-astakos-app/astakos/im/static/im/images/arrow-white.png differ
diff --git a/snf-astakos-app/astakos/im/static/im/images/symbols.png b/snf-astakos-app/astakos/im/static/im/images/symbols.png
new file mode 100644 (file)
index 0000000..2e3849b
Binary files /dev/null and b/snf-astakos-app/astakos/im/static/im/images/symbols.png differ
index d0e6174..927f21c 100644 (file)
@@ -1,20 +1,23 @@
-function setContainerMinHeight(){\r
-\r
-    var h = $('.header').height();\r
-    var f = $('.footer').height();\r
-    var w = $(window).height();\r
-    var pTop = parseInt (($('.container .wrapper').css('padding-top').replace("px", "")) );\r
-    var pBottom = parseInt (($('.container .wrapper').css('padding-bottom').replace("px", "")));\r
+function setContainerMinHeight( applicableDiv){\r
+       \r
+    if ( $(applicableDiv).length > 0 ) {\r
+        //var h = $('.header').height(); div.header is not found \r
+        var f = $('.footer').height();\r
+        var w = $(window).height();\r
+        var pTop = parseInt (($(applicableDiv).css('padding-top').replace("px", "")) );\r
+        var pBottom = parseInt (($(applicableDiv).css('padding-bottom').replace("px", "")));\r
 \r
-    var c = w - ( h+f+pTop+pBottom);\r
-    $('.container .wrapper').css('min-height', c);\r
-    \r
+        var c = w - ( f+pTop+pBottom+36);//36 is header's height.\r
+        $(applicableDiv).css('min-height', c);\r
+    }    \r
 \r
 }\r
 \r
 $(document).ready(function() {\r
-\r
-       setContainerMinHeight();\r
+       \r
+        \r
+    setContainerMinHeight('.container .wrapper');\r
+    \r
        \r
     $('.show-extra').click(function(e) {\r
         e.preventDefault();\r
@@ -33,23 +36,27 @@ $(document).ready(function() {
         $(this).parents('.box-more').toggleClass('border');\r
     });\r
        \r
-               \r
+       var topMargin=parseInt($('.mainlogo').height())+parseInt($('.top-msg').css('marginBottom'));\r
+       $('.mainlogo').css('marginTop','-'+topMargin+'px')\r
+       \r
        $('.top-msg a.close').click(function(e) {\r
-        e.preventDefault();\r
-        $(this).parents('.top-msg').slideUp('5000', function() {\r
+        $('.top-msg').animate({\r
+            paddingTop:'0',\r
+            paddingBottom:'0',\r
+            height:'0'\r
+        }, 1000, function (){\r
              $('.top-msg').removeClass('active')\r
         });\r
-    });\r
-    \r
+        $('.mainlogo').animate({\r
+            marginTop:'0'\r
+        }, 1000, function (){\r
+             //todo\r
+        });\r
+    });        \r
+        \r
     //$('select').dropkick();\r
     \r
-  \r
-    if ( $('#os').length > 0 ) {\r
-       var os = BrowserDetect.OS;\r
-       if ( os!=="an unknown OS" ) {\r
-           $('#os').html('version '+os);\r
-        }\r
-    }\r
\r
     \r
     $('.top-msg .success').parents('.top-msg').css(\r
        {\r
@@ -74,3 +81,9 @@ $(document).ready(function() {
     )\r
     \r
 });\r
+\r
+$(window).resize(function() {\r
+    \r
+   setContainerMinHeight('.container .wrapper');\r
+\r
+});\r
index 8dfaba7..2b54a8a 100644 (file)
@@ -94,22 +94,27 @@ var BrowserDetect = {
                {\r
                        string: navigator.platform,\r
                        subString: "Win",\r
-                       identity: "Windows"\r
+                       identity: "windows"\r
                },\r
                {\r
                        string: navigator.platform,\r
                        subString: "Mac",\r
-                       identity: "Mac"\r
+                       identity: "MacOS"\r
                },\r
                {\r
-                          string: navigator.userAgent,\r
-                          subString: "iPhone",\r
-                          identity: "iPhone/iPod"\r
+                  string: navigator.userAgent,\r
+                  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
-                       identity: "Linux"\r
+                       identity: "linux"\r
                }\r
        ]\r
 \r
index 65950a0..532e0a6 100644 (file)
                    <a href="#" title="close" class="close">X</a>
                </div>
                {% endif %}
-               <h1>
+               <div class="mainlogo">
                        <a href="/im/">
                                <img src="{{ IM_STATIC_URL }}images/accounts-logo.png" alt="accounts" />
                        </a>
-               </h1>
+               </div>
             {% block page.nav %}
             <div class="navigation">
                    <ul>
index 2119187..fc21456 100644 (file)
@@ -11,6 +11,7 @@
      <p class="{% if field.blank %}required{% endif %}">
         {{ field.label_tag }}
         {{ field|safe }}
+        <span class="extra-img">&nbsp;</span>
         {%  if field.help_text %}
                <span class="info"> 
                            <em>more info</em>
index 31ff8d3..aea79ca 100644 (file)
@@ -1,14 +1,17 @@
 {% extends "im/account_base.html" %}
 
 {% block page.body %}
-<div class="two-cols clearfix">
-       <div class="rt">
+<div class="full bottom-bordered">
+       <div class="lt-div">
+               <p>Invite someone else</p>
+       </div>
+        
         {% if inviter.invitations %}
          <form action="{% url astakos.im.views.invite %}" method="post"
-           class="innerlabels">{% csrf_token %}
-           <h2>INVITE SOMEONE ELSE</h2>
+           class="innerlabels overflow-hidden">{% csrf_token %}
+       
            {% with invitation_form as form %}
-           {% include "im/form_render.html" %}
+               {% include "im/form_render.html" %}
            {% endwith %}
        
            <div class="form-row submit">
            </div>
          </form>
          {% endif %}
-       </div>
-       <div class="lt {% block innerpage.class %}{% endblock %}">
+        
+</div>
+       <div class="full {% block innerpage.class %}{% endblock %}">
            
            <h2>You have <em>{{ inviter.invitations }}</em> invitation{{ inviter.invitations|pluralize }} left.</h2>
            {% if sent|length %}
@@ -43,7 +48,7 @@
                <p>No invitations sent</p>
            {% endif %}
        </div>     
-</div>
+
 
 
 {% endblock %}
index e394309..0965d68 100644 (file)
@@ -45,7 +45,7 @@
     {% block body.signup %}
            {% for o in im_modules %}
                {% if o != 'local' %}
-               <br />
+              
                {% endif %}
            {% endfor %}
            <div class="bottom">