[bknr-cvs] hans changed trunk/projects/quickhoney/website/

[BKNR Commits]

Revision: 3737
Author: hans
URL: http://bknr.net/trac/changeset/3737

Partially revive the CMS
Correct menuu row positioning
Make home buttons quadratic again

U   trunk/projects/quickhoney/website/static/javascript.js
U   trunk/projects/quickhoney/website/static/styles.css
U   trunk/projects/quickhoney/website/templates/index.xml

Modified: trunk/projects/quickhoney/website/static/javascript.js
===================================================================
--- trunk/projects/quickhoney/website/static/javascript.js	2008-08-26 11:01:47 UTC (rev 3736)
+++ trunk/projects/quickhoney/website/static/javascript.js	2008-08-26 18:55:34 UTC (rev 3737)
@@ -73,10 +73,10 @@
 
 function login_complete(json_result) {
 
-    logged_in = json_result.admin;
-
     log('login_complete, admin: ' + json_result.admin + ' login: ' + json_result.login);
 
+    logged_in = json_result.admin;
+
     if (logged_in) {
 	replaceChildNodes("username", json_result.login);
 	$("login_status").style.visibility = 'visible';
@@ -124,21 +124,14 @@
 
 function send_login() {
 
-    loadJSONDoc("/json-login?__username="
-                + document.login_form.username.value
-                + "&__password="
-                + document.login_form.password.value)
-        .addCallbacks(login_complete, alert);
-
-    show_cms_window();
-    
     return false;
 }
 
 function send_logout() {
 
     logged_in = false;
-    window.frames['login_iframe'].window.location.replace('/logout');
+    loadJSONDoc("/logout")
+        .addCallbacks(function () {}, alert);
 
     show_cms_window("login_form");
 }
@@ -394,8 +387,12 @@
 function show_cue(text) {
     $("cue").style.visibility = 'visible';
     $('footer').style.visibility = 'hidden';
-    display_cue = text;
-    animate_cue();
+    if (display_cue) {
+        display_cue = text;
+    } else {
+        display_cue = text;
+        animate_cue();
+    }
 }
 
 function hide_cue() {
@@ -642,7 +639,7 @@
             map(function (directory) {
                     var id = 'home_' + directory;
                     $(id).style.visibility = 'hidden';
-                    $(id).src = random_button_image('home', directory, 318, 208, directory);
+                    $(id).src = random_button_image('home', directory, 318, 318, directory);
                 }, home_buttons);
 
             if (subcategories[current_directory]) {
@@ -1159,6 +1156,7 @@
     }
 
     load_button_images();
+    loadJSONDoc("/json-login").addCallbacks(login_complete, alert);
     loadJSONDoc('/json-news-archive/quickhoney').addCallbacks(initialize_news_archive, alert);
 
     if (!document.location.href.match(/#/)) {

Modified: trunk/projects/quickhoney/website/static/styles.css
===================================================================
--- trunk/projects/quickhoney/website/static/styles.css	2008-08-26 11:01:47 UTC (rev 3736)
+++ trunk/projects/quickhoney/website/static/styles.css	2008-08-26 18:55:34 UTC (rev 3737)
@@ -148,6 +148,13 @@
 
 .autonews a { color: #30be01; }
 
+#m_home { top: 30px; left: 36px; }
+#m_pixel { top: 36px; left: 250px; }
+#m_vector { top: 36px; left: 331px; }
+#m_news { top: 36px; left: 423px; }
+#m_shop { top: 36px; left: 508px; }
+#m_contact { top: 36px; left: 584px; }
+
 #menu img.selected {
 	visibility: hidden;
         z-index: 110;
@@ -156,7 +163,6 @@
 #menu a {
 	position: absolute;
 	padding: 0px;
-	top: 36px;
 	border-width: 0px;
 }
 
@@ -167,17 +173,6 @@
         border-width: 0px;
 }
 
-#m_quickhoney {
-	top: 28px;
-	left: 36px;
-}
-
-#m_pixel { left: 250px; }
-#m_vector { left: 331px; }
-#m_news { left: 423px; }
-#m_shop { left: 508px; }
-#m_contact { left: 584px; }
-
 /* path / version */
 
 #path-and-version {
@@ -314,7 +309,7 @@
 
 a.home_button img {
 	width: 318px;
-	height: 208px;
+	height: 318px;
 }
 
 #home div {

Modified: trunk/projects/quickhoney/website/templates/index.xml
===================================================================
--- trunk/projects/quickhoney/website/templates/index.xml	2008-08-26 11:01:47 UTC (rev 3736)
+++ trunk/projects/quickhoney/website/templates/index.xml	2008-08-26 18:55:34 UTC (rev 3737)
@@ -60,21 +60,21 @@
     <div id="home" class="page">
       <div>
         <a href="#pixel" class="home_button">
-          <img alt="home pixel" id="home_pixel" src="/image/trans" width="318" height="208" 
+          <img alt="home pixel" id="home_pixel" src="/image/trans" width="318" height="318" 
                onclick="shuffle_button_images()" onload="reveal_image(this);" class="button-image" />
         </a>
         <a href="#vector" class="home_button">
-          <img alt="home vector" id="home_vector" src="/image/trans" width="318" height="208"
+          <img alt="home vector" id="home_vector" src="/image/trans" width="318" height="318"
                onclick="shuffle_button_images()" onload="reveal_image(this);" class="button-image" />
         </a>
       </div>
       <div>
         <a href="#news" class="home_button">
-          <img alt="home news" id="home_news" src="/image/trans" width="318" height="208"
+          <img alt="home news" id="home_news" src="/image/trans" width="318" height="318"
                onclick="shuffle_button_images()" onload="reveal_image(this);" class="button-image" />
         </a>
         <a href="#shop" class="home_button">
-          <img alt="home shop" id="home_shop" src="/image/trans" width="318" height="208"
+          <img alt="home shop" id="home_shop" src="/image/trans" width="318" height="318"
                onclick="shuffle_button_images()" onload="reveal_image(this);" class="button-image" />
         </a>
       </div>