set login controls to the right of the map

diff --git a/application/views/scripts/idx/index.phtml b/application/views/scripts/idx/index.phtml
index 3171064fbbf5d6eedce72e4675f8dd3a756fd4e3..f19dd4255ca0503c00b0718b8fb60fdcff11e5de 100644 (file)
--- a/application/views/scripts/idx/index.phtml
+++ b/application/views/scripts/idx/index.phtml
@@ -20,36 +20,48 @@
 <?php }?>
 </div>
 
-<div id="data_controls">
-    <div id="data_controls_btns">
-<?php if (isset($this->path)) { ?>
-    <input id="clone-btn" name="clone-btn" type="button" value="<?php echo $this->translate('duplicate');?>">
-    <br>
-    <input id="edit-btn" name="edit-btn" type="button" value="<?php echo $this->translate('edit');?>">
-<?php } else {?>
-    <input id="create-btn" name="create-btn" type="button" value="<?php echo $this->translate('start a route');?>">
-<?php } ?>
+
+<div id="menu">
+
+    <?php echo $this->localeSwitcher(); ?>
+
+    <div id="login_controls">
+        <div>
+            <div class="login-anchor">
+            <?php
+                echo $this->anchor('login', $this->translate('login'), array('id' => 'login_control_anchor'));
+                $anchortext = sprintf("%s<img id=\"account-info-bullet\" src=\"icons/bullet_arrow_right.png\"><span id=\"account-info\"><br>%s</span>",
+                                      $this->translate('create an account'),
+                                      $this->translate('Whith an account, you can manage and modify your routes'));
+                ?>
+               </div>
+               <div class="login-anchor">
+               <?php
+                echo $this->anchor('', $anchortext, array('id' => 'user_control_anchor'), false);
+            ?>
+            </div>
+        </div>
+        <div>
+            <?php echo $this->logoutLink(); ?>
+        </div>
     </div>
 
-<?php
-    print $this->geomform;
-?>
+    <div id="data_controls">
+        <div id="data_controls_btns">
+    <?php if (isset($this->path)) { ?>
+        <input id="clone-btn" name="clone-btn" type="button" value="<?php echo $this->translate('duplicate');?>">
+        <br>
+        <input id="edit-btn" name="edit-btn" type="button" value="<?php echo $this->translate('edit');?>">
+    <?php } else {?>
+        <input id="create-btn" name="create-btn" type="button" value="<?php echo $this->translate('start a route');?>">
+    <?php } ?>
+        </div>
 
+    <?php
+        print $this->geomform;
+    ?>
 </div>
 
-<div id="login_controls">
-    <div>
-        <?php
-            echo $this->anchor('login', $this->translate('login'), array('id' => 'login_control_anchor', 'class' => 'login-anchor'));
-            $anchortext = sprintf("%s<img id=\"account-info-bullet\" src=\"icons/bullet_arrow_right.png\"><span id=\"account-info\"><br>%s</span>",
-                                  $this->translate('create an account'),
-                                  $this->translate('Whith an account, you can manage and modify your routes'));
-            echo $this->anchor('', $anchortext, array('id' => 'user_control_anchor', 'class' => 'login-anchor'), false);
-        ?>
-    </div>
-    <div>
-        <?php echo $this->logoutLink(); ?>
-    </div>
 </div>
 
 <div id="newpwd_area" class="modal">
@@ -66,19 +78,17 @@
     ?>
 </div>
 
-  <div id="login_area" class="modal">
-     <div id="login_message" class="message"></div>
+<div id="login_area" class="modal">
+   <div id="login_message" class="message"></div>
 
-  <?php
-    print $this->loginform;
-  ?>
-
-  <p id="login_area_create"><a id="login_area_create_anchor" href=""><?php echo $this->translate('create an account')?></a></p>
+<?php
+  print $this->loginform;
+?>
 
-  </div>
+<p id="login_area_create"><a id="login_area_create_anchor" href=""><?php echo $this->translate('create an account')?></a></p>
 
-  <div id="termsofusearea" class="modal">
-    <iframe id="termsofuseiframe" width="100%" height="100%" frameborder="0"></iframe>
-  </div>
+</div>
 
-<?php echo $this->localeSwitcher(); ?>
+<div id="termsofusearea" class="modal">
+  <iframe id="termsofuseiframe" width="100%" height="100%" frameborder="0"></iframe>
+</div>

diff --git a/public/css/syj.css b/public/css/syj.css
index 661301fb6e3643888d771a26b17f2f6548acce78..2775f20e9f0bca45da27a141feadeb62da57917a 100644 (file)
--- a/public/css/syj.css
+++ b/public/css/syj.css
@@ -43,8 +43,14 @@ body, html {
 }
 
 /*
- * controls rules
+ * menu rules
  */
+
+#menu {
+    border: 1px solid green;
+    text-align: right;
+}
+
 #data_controls {
     position: absolute;
     right: 0.5em;
@@ -78,14 +84,15 @@ body, html {
 #login_controls {
     padding-top: 8px;
     padding-left: 3em;
+    clear: right;
 }
 
 .login-anchor {
-    display: block;
-    float: left;
-    position: relative;
+    float: right;
+    clear: right;
+    min-width: 150px;
+    margin: 2px 10px 2px 0;
     background-color: white;
-    margin: 0px 10px 0px 10px;
     text-decoration: none;
     color: #0000EE;
     border: #1E90FF 2px solid;
@@ -107,6 +114,13 @@ body, html {
     vertical-align: middle;
 }
 
+#other-language {
+    opacity: 0.85;
+    filter:alpha(opacity=85);
+    background-color: white;
+    padding: 5px 1px 5px 1px;
+}
+
 /*
  * login rules
  */
@@ -133,6 +147,10 @@ body, html {
     text-align: right;
 }
 
+#user_control_anchor {
+    text-align: right;
+}
+
 #user_email-desc {
     margin: 0px 0px 12px 0px;
     padding: 8px 2px 8px 2px;
@@ -145,14 +163,3 @@ body, html {
     opacity: 1;
     filter:alpha(opacity=100);
 }
-
-#other-language {
-    opacity: 0.85;
-    filter:alpha(opacity=85);
-    position: absolute;
-    right: 10px;
-    top: 10px;
-    background-color: white;
-    padding: 5px 1px 5px 1px;
-    margin: 0;
-}