BUG: Fixed style IE7-8

Charles Marion · Charles Marion · commit 29a4017a580c · 2011-06-09T11:13:37.000+02:00
Added no javascript and IE6 detection refs #130
diff --git a/core/controllers/IndexController.php b/core/controllers/IndexController.php
@@ -38,4 +38,16 @@ function indexAction()
     $this->_forward('index', "feed");
     } // end method indexAction   
     
+  /* no javascript*/
+  function nojsAction()
+    {
+    $this->disableLayout();
+    } // end method indexAction   
+    
+  /* no javascript*/
+  function nobrowserAction()
+    {
+    $this->disableLayout();
+    } // end method indexAction   
+    
 }//end class
diff --git a/core/controllers/ItemController.php b/core/controllers/ItemController.php
@@ -130,8 +130,11 @@ function viewAction()
       }
      
     $items = array();
+    $this->view->backUploaded = false;
+    $this->view->currentFolder = false;
     if(isset($this->userSession->uploaded) && in_array($itemDao->getKey(), $this->userSession->uploaded))
       {
+      $this->view->backUploaded = true;
       $items = $this->Item->load($this->userSession->uploaded);
       }
     else
@@ -150,9 +153,9 @@ function viewAction()
         if(isset($currentFolder))
           {
           $items = $this->Folder->getItemsFiltered($currentFolder, $this->userSession->Dao, MIDAS_POLICY_READ);
+          $this->view->currentFolder = $currentFolder;
           }
         }
-
       }
       
     foreach($items as $key => $item)
diff --git a/core/layouts/layout.phtml b/core/layouts/layout.phtml
@@ -20,6 +20,13 @@ echo $this->doctype()
     
     <meta name="Description" content="<?php echo htmlentities($this->metaDescription)?>" /> 
     <meta name="Keywords" content="<?php echo htmlentities($this->metaKeywords)?>" /> 
+    <noscript> 
+    <meta http-equiv="refresh" content="1; URL=<?php echo $this->webroot?>/index/nojs"> 
+    </noscript> 
+    
+    <!--[if lte IE 6]>
+      <meta http-equiv="refresh" content="1; URL=<?php echo $this->webroot?>/index/nobrowser"> 
+    <![endif]-->
    
     <!-- Import CSS -->
     <link rel="shortcut icon" href="<?php echo $this->coreWebroot ?>/public/images/icons/favicon.ico" />
diff --git a/core/public/css/common/common.browser.css b/core/public/css/common/common.browser.css
@@ -4,6 +4,7 @@
 }*/
 
 ul.pathBrowser{
+  padding-top: 3px;
   display: block;
   list-style-type: disc;
   margin: 0px;
diff --git a/core/public/css/layout/jquery.treeTable.css b/core/public/css/layout/jquery.treeTable.css
@@ -5,12 +5,12 @@
  * ========================================================================= */
 
 .treeTable .browserPrivacyInformation{
-  float:right;
+  position: absolute;
+  right: 195px; 
   color: grey;
   font-size: 10px;
   padding-right: 8px;
-  padding-left
-  : 0px;
+  padding-left  : 0px;
 }
 
 /* jquery.treeTable.collapsible
diff --git a/core/public/css/layout/main.css b/core/public/css/layout/main.css
@@ -169,7 +169,6 @@ div.Topbar {
   font-family: 'Lucida Grande', Verdana, Arial, Helvetica, sans-serif;
   font-size: 12px;
   background: #000;
-  position: relative;
   text-align: left;
   z-index: 99;
   background-color: #414141;
@@ -198,6 +197,7 @@ div.Topbar ul{
   list-style-type: disc;
   margin: 0px 25px 0px 15px;
   padding: 0px;
+  position: relative;
 }
 
 div.Topbar ul li{
@@ -207,6 +207,7 @@ div.Topbar ul li{
   margin-left: 10px;
   padding-left: 10px;
   border-left: 1px grey solid;
+  position: relative;
 }
 
 div.Topbar ul li.first{
@@ -495,14 +496,17 @@ div.SideBar ul li a span{
 div.SideBar hr {
   border-bottom: 1px solid white;
   border-top: 1px solid #DAD8D4;
-  margin: 1em -30px 1em 0px;
+  margin: 5px -30px 5px 0px;
 }
 
 div.SideBar h1, div.viewSideBar h1 {
   color: #999;
   font-size: 11px;
   text-shadow: white 0px 1px 1px;
   text-transform: uppercase;
+  margin-top: 0.67em;
+  margin-bottom: 0.67em;
+  
 }
 
 
@@ -532,7 +536,6 @@ div.TopbarRight  li ul{
   border:0px;
   position:absolute;
   width:120px;
-  z-index:200;
   
   /*top:1em;
 		/*left:0;*/
diff --git a/core/public/css/layout/mainIE.css b/core/public/css/layout/mainIE.css
@@ -3,5 +3,9 @@ div.SideBar {
 }
 
 div.viewHeader {
-  border-bottom: none !important;
+
+}
+
+div.TopbarRight  li ul{
+  padding:0px 0px 0px 0px!important;
 }
diff --git a/core/public/css/user/user.register.css b/core/public/css/user/user.register.css
@@ -7,7 +7,7 @@ div.registerContent {
 div.registerInfo {
   float: left;
   color: white;
-  height: 140px;
+  height: 110px;
   width: 250px;
   border: 1px solid grey;
   margin-top: 15px;
diff --git a/core/public/css/user/user.settings.css b/core/public/css/user/user.settings.css
@@ -20,8 +20,11 @@ div#accountPrivacy{
 
 div#accountPrivacy label{
   width: auto!important;
+  float: none!important;
+}
+div#accountPrivacy br{
+  display:none;
 }
-
 div#imageActual{
   float:right;
 }
diff --git a/core/public/images/icons/back.png b/core/public/images/icons/back.png
diff --git a/core/public/js/common/common.browser.js b/core/public/js/common/common.browser.js
@@ -284,7 +284,6 @@
         {
         html+='<img class="infoLogo" alt="Data Type" src="'+json.global.coreWebroot+'/public/images/icons/document-big.png" />';
         }
-        console.log(arrayElement['name']);
         html+='<span class="infoTitle" >'+sliceFileName(arrayElement['name'],27)+'</span>';
         html+='<table>';
         html+='  <tr>';
diff --git a/core/views/community/manage.phtml b/core/views/community/manage.phtml
@@ -34,6 +34,17 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
   ?>
   </div>
   <div class="genericInfo">
+    <div class ="genericWrapperTopRight">
+
+         <?php
+          echo '<div style="float:right;margin-right:2px;" class="genericBigButton ">';
+            echo "<a  href='{$this->webroot}/community/{$this->communityDao->getKey()}'><img style='float:left;margin-right:2px;' alt='' src='{$this->coreWebroot}/public/images/icons/back.png'/>";
+            echo $this->t('Back');  
+            echo "</a>";
+          echo '</div>';
+          
+        ?>
+    </div>
     <div class="genericName"><?php echo $this->communityDao->getName();?></div>
   </div>
   <img class="tabsLoading" alt=""  src="<?php echo $this->coreWebroot?>/public/images/icons/loading.gif" />
@@ -106,7 +117,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
           foreach($this->members as $user)
             {
             echo "<tr>";
-            echo "<td  class='tdUser userid_{$user->getKey()}'><input ";
+            echo "<td width='70%' class='tdUser userid_{$user->getKey()}'><input ";
             if(in_array($user->getKey(), $administratorIds))
               {
               echo "admin = 'true' ";
diff --git a/core/views/community/view.phtml b/core/views/community/view.phtml
@@ -39,7 +39,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
       ?>
      <div class="genericBigButton genericWrapperTopRight">
      <form type='post' action=''>
-      <input name='joinCommunity' type='submit' value='<?php echo $this->t('Join the community') ?>' />
+      <input style="margin:0px;padding:0px;" name='joinCommunity' type='submit' value='<?php echo $this->t('Join the community') ?>' />
     </form>
     </div>
    <?php } ?>    
@@ -145,14 +145,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
   </div>
 </div>
 
-<div id="guideRobot">
-   <?php
-    foreach($this->folders as $folder)
-      {
-      echo "<a href='{$this->webroot}/folder/{$folder->getKey()}'>{$folder->getName()}</a> ";
-      } 
-    ?>  
-</div>
+
 
 <div class="viewSideBar">
   
@@ -225,5 +218,12 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
 
 
 
-
+<div id="guideRobot">
+   <?php
+    foreach($this->folders as $folder)
+      {
+      echo "<a href='{$this->webroot}/folder/{$folder->getKey()}'>{$folder->getName()}</a> ";
+      } 
+    ?>  
+</div>
 
diff --git a/core/views/import/index.phtml b/core/views/import/index.phtml
@@ -13,13 +13,26 @@ PURPOSE.  See the above copyright notices for more information.
 <?php if(isset($this->errormessage)) { echo $this->errormessage; } ?>
 <?php if(isset($this->statusmessage)) { echo $this->statusmessage; } ?>
 
+
+    <div class ="genericWrapperTopRight">
+         <?php
+          echo '<div style="margin-right:2px;" class="genericBigButton ">';
+            echo "<a  href='{$this->webroot}/admin#tabs-assetstore'><img style='float:left;margin-right:2px;' alt='' src='{$this->coreWebroot}/public/images/icons/back.png'/>";
+            echo $this->t('Back');  
+            echo "</a>";
+          echo '</div>';
+          
+        ?>
+    </div>
+<br/>
 <?php 
   $this->headScript()->appendFile($this->coreWebroot.'/public/js/import/import.index.js');
   $this->headScript()->appendFile($this->coreWebroot.'/public/js/jquery/jquery.form.js');
   
   $this->headLink()->appendStylesheet($this->coreWebroot.'/public/css/jquery/jquery.filetree.css');
   $this->headLink()->appendStylesheet($this->coreWebroot.'/public/css/import/import.index.css');
   $this->headLink()->appendStylesheet($this->coreWebroot.'/public/css/assetstore/assetstore.add.css');
+ 
   
   echo $this->importForm;
 ?>
diff --git a/core/views/index/nobrowser.phtml b/core/views/index/nobrowser.phtml
@@ -0,0 +1,16 @@
+<?php
+/*=========================================================================
+MIDAS Server
+Copyright (c) Kitware SAS. 20 rue de la Villette. All rights reserved.
+69328 Lyon, FRANCE.
+
+See Copyright.txt for details.
+This software is distributed WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the above copyright notices for more information.
+=========================================================================*/
+?>
+
+<pre>
+Your browser is not supported.
+<pre>
diff --git a/core/views/index/nojs.phtml b/core/views/index/nojs.phtml
@@ -0,0 +1,39 @@
+<?php
+/*=========================================================================
+MIDAS Server
+Copyright (c) Kitware SAS. 20 rue de la Villette. All rights reserved.
+69328 Lyon, FRANCE.
+
+See Copyright.txt for details.
+This software is distributed WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the above copyright notices for more information.
+=========================================================================*/
+?>
+
+<pre>
+Enabling JavaScript is required.
+
+Internet Explorer 7.0+
+
+Click the Tools menu.
+Select Internet Options.
+Click the Security tab.
+Click the Custom Level button.
+Scroll down until you see the 'Scripting' section. Select the 'Enable' radio button for 'Active Scripting.'
+Click the OK button.
+If you see a confirmation window, click the Yes button.
+Firefox 3.6+
+
+Click the Tools menu.
+Select Options.
+Click the Content tab.
+Select the 'Enable JavaScript' checkbox.
+Click the OK button.
+Safari 2 or 3
+
+Click the Safari menu.
+Select Preferences.
+Click the Security tab.
+Select the 'Enable JavaScript' checkbox.
+<pre>
diff --git a/core/views/item/view.phtml b/core/views/item/view.phtml
diff --git a/core/views/user/manage.phtml b/core/views/user/manage.phtml

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,11 @@ function viewAction()`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`$items = array();`
	`133`	`+ $this->view->backUploaded = false;`
	`134`	`+ $this->view->currentFolder = false;`
`133`	`135`	`if(isset($this->userSession->uploaded) && in_array($itemDao->getKey(), $this->userSession->uploaded))`
`134`	`136`	`{`
	`137`	`+ $this->view->backUploaded = true;`
`135`	`138`	`$items = $this->Item->load($this->userSession->uploaded);`
`136`	`139`	`}`
`137`	`140`	`else`
`@@ -150,9 +153,9 @@ function viewAction()`
`150`	`153`	`if(isset($currentFolder))`
`151`	`154`	`{`
`152`	`155`	`$items = $this->Folder->getItemsFiltered($currentFolder, $this->userSession->Dao, MIDAS_POLICY_READ);`
	`156`	`+ $this->view->currentFolder = $currentFolder;`
`153`	`157`	`}`
`154`	`158`	`}`
`155`		`-`
`156`	`159`	`}`
`157`	`160`
`158`	`161`	`foreach($items as $key => $item)`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,9 @@ div.SideBar {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`div.viewHeader {`
`6`		`- border-bottom: none !important;`
	`6`	`+`
	`7`	`+}`
	`8`	`+`
	`9`	`+div.TopbarRight li ul{`
	`10`	`+ padding:0px 0px 0px 0px!important;`
`7`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,11 @@ div#accountPrivacy{`
`20`	`20`
`21`	`21`	`div#accountPrivacy label{`
`22`	`22`	`width: auto!important;`
	`23`	`+ float: none!important;`
	`24`	`+}`
	`25`	`+div#accountPrivacy br{`
	`26`	`+ display:none;`
`23`	`27`	`}`
`24`		`-`
`25`	`28`	`div#imageActual{`
`26`	`29`	`float:right;`
`27`	`30`	`}`