yet another request by laurent

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@194 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog
index 70def0aaa8364ed3fffdec114148379da0f9712e..ea6afae1692cb94166462af87d1a45f0969c7367 100644 (file)
--- a/SOGo/UI/Common/ChangeLog
+++ b/SOGo/UI/Common/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-12  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * UIxPageFrame.wox: removed left side navigation completely as it
+         currently doesn't make too much sense and contrasts with the
+         user interface layout which already has been agreed about (v0.9.12)
+
 2004-08-12  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxWinClose.wox: removed rendering of (X) on Laurent's request

diff --git a/SOGo/UI/Common/UIxPageFrame.wox b/SOGo/UI/Common/UIxPageFrame.wox
index 700b1705514e9cf22bcc7d8c95fad21ef2c65088..fb5ebd14014f4e62323295821c26da0b1211cd93 100644 (file)
--- a/SOGo/UI/Common/UIxPageFrame.wox
+++ b/SOGo/UI/Common/UIxPageFrame.wox
@@ -48,233 +48,35 @@
           </table>
         </td>
       </tr>
+      <!--
       <tr>
         <td valign="top">
           <table cellpadding="0" cellspacing="0" border="0" width="100%">
-            <tr>
-              <td valign="top">
-                <table border="0"
-                       cellspacing="0"
-                       cellpadding="0"
-                       class="leftmenu"
-                >
-                  <tr>
-                    <td>
-                      <img rsrc:src="box_topleft.gif"/>
-                    </td>
-                    <td valign="top" rsrc:background="box_top.gif">
-                      <img rsrc:src="box_top.gif"/>
-                    </td>
-                    <td>
-                      <img rsrc:src="box_topright.gif"/>
-                    </td>
-                  </tr>
-                  <tr valign="top">
-                    <td rsrc:background="box_left.gif">
-                      <img rsrc:src="box_left.gif"/>
-                    </td>
-                    <td width="100%">
-                      <table width="100%"
-                             border="0"
-                             cellspacing="2"
-                             cellpadding=""
-                             class="leftmenu"
-                      >
-                        <tr>
-                          <td>
-                            <font class="skydockfont">
-                              <a var:href="userRootURL"
-                                 class="skydockfont"
-                              >SOGo (<var:string value="shortUserNameForDisplay" />)</a>
-                            </font>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td colspan="2">
-                            <table cellpadding="0"
-                                   cellspacing="0"
-                                   border="0"
-                                   width="100%"
-                            >
-                              <tr>
-                                <td class="linecolor">
-                                  <img rsrc:src="line_left.gif"/>
-                                </td>
-                                <td class="linecolor" width="100%">
-                                  <img rsrc:src="line_stretch.gif"/>
-                                </td>
-                                <td class="linecolor">
-                                  <img rsrc:src="line_right.gif"/>
-                                </td>
-                              </tr>
-                            </table>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td height="3"/>
-                        </tr>
-                        <tr>
-                          <td valign="middle">
-                            <font class="skydockfont">
-                              <a var:href="userRootURL"
-                                 class="skydockfont"
-                              ><var:string label:value="Contacts" /></a>
-                            </font>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td valign="middle">
-                            <font class="skydockfont">
-                              <a var:href="calendarRootURL"
-                                 class="skyDockFont"
-                              ><var:string label:value="Calendar" /></a>
-                            </font>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                    <td rsrc:background="box_right.gif">
-                      <img rsrc:src="box_right.gif"/>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>
-                      <img rsrc:src="box_botleft.gif"/>
-                    </td>
-                    <td rsrc:background="box_bottom.gif">
-                      <img rsrc:src="box_bottom.gif"/>
-                    </td>
-                    <td>
-                      <img rsrc:src="box_botright.gif"/>
-                    </td>
-                  </tr>
-                </table>
+            <tr valign="top">
+              <td align="left" width="10%">
+                <a var:href="userRootURL"
+                   class="skydockfont"
+                >SOGo (<var:string value="shortUserNameForDisplay" />)</a>
+              </td>
+              <td align="left" width="10%">
+                <a var:href="calendarRootURL"
+                   class="skyDockFont"
+                ><var:string label:value="Calendar" /></a>
+              </td>
+              <td align="left" width="10%">
+                <a var:href="userRootURL"
+                   class="skydockfont"
+                ><var:string label:value="Contacts" /></a>
+              </td>
+              <td align="left" width="70%">
+                <var:entity const:name="nbsp" />
               </td>
             </tr>
           </table>
-          <br/>
-          <span>
-            <table cellspacing="0"
-                   class="leftmenu"
-                   border="0"
-                   cellpadding="0"
-            >
-              <tr>
-                <td>
-                  <img rsrc:src="box_topleft.gif"/>
-                </td>
-                <td rsrc:background="box_top.gif">
-                  <img rsrc:src="box_top.gif"/>
-                </td>
-                <td>
-                  <img rsrc:src="box_topright.gif"/>
-                </td>
-              </tr>
-              <tr valign="top">
-                <td rsrc:background="box_left.gif">
-                  <img rsrc:src="box_left.gif"/>
-                </td>
-                <td width="100%">
-                  <table width="100%"
-                         cellspacing="2"
-                         class="leftmenu"
-                         border="0"
-                         cellpadding=""
-                  >
-                    <tr>
-                      <td>
-                        <font class="skydockfont"
-                        ><var:string label:value="Misc" /></font>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="2">
-                        <table width="100%"
-                               cellspacing="0"
-                               border="0"
-                               cellpadding="0"
-                        >
-                          <tr>
-                            <td class="linecolor">
-                              <img rsrc:src="line_left.gif"/>
-                            </td>
-                            <td width="100%" class="linecolor">
-                              <img rsrc:src="line_stretch.gif"/>
-                            </td>
-                            <td class="linecolor">
-                              <img rsrc:src="line_right.gif"/>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td height="3"/>
-                    </tr>
-                    <tr>
-                      <td valign="middle">
-                        <a var:href="userRootURL"
-                           class="skydockfont"
-                        >New Email</a>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td valign="middle">
-                        <a var:href="userRootURL"
-                           class="skydockfont"
-                        >Inbox</a>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td valign="middle">
-                        <a var:href="userRootURL"
-                           class="skydockfont"
-                        >Preferences</a>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td valign="middle">
-                        <a var:href="userRootURL"
-                           target="private_desktop"
-                           class="skydockfont"
-                        >Home</a>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td valign="middle">
-                        <a var:href="userRootURL"
-                           target="public_desktop"
-                           class="skydockfont"
-                        >Desktop</a>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td valign="middle">
-                        <a var:href="userRootURL"
-                           class="skydockfont"
-                        >Logout</a>
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-                <td rsrc:background="box_right.gif">
-                  <img rsrc:src="box_right.gif"/>
-                </td>
-              </tr>
-              <tr>
-                <td>
-                  <img rsrc:src="box_botleft.gif"/>
-                </td>
-                <td rsrc:background="box_bottom.gif">
-                  <img rsrc:src="box_bottom.gif"/>
-                </td>
-                <td>
-                  <img rsrc:src="box_botright.gif"/>
-                </td>
-              </tr>
-            </table>
-          </span>
         </td>
+      </tr>
+      -->
+      <tr>
         <td valign="top" width="100%">
           <var:component-content/>
         </td>

diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version
index c351558f441a4d159527ee99c46d76a467ff4349..9cef79939ea704d51f0e6725b9964991d0cafe31 100644 (file)
--- a/SOGo/UI/Common/Version
+++ b/SOGo/UI/Common/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12