Merge branch 'rc' of github.com:vanillaforums/Garden into rc

champx · Jul 21, 2010 · cdcbb2d · cdcbb2d
2 parents 2fa15ba + 95d8607
commit cdcbb2d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/applications/dashboard/design/admin.css b/applications/dashboard/design/admin.css
@@ -1187,12 +1187,6 @@ div.Popup .Footer input.Button {
 	margin-right: 2px;
 }
 
-.Version {
-   color: #555;
-   text-align: center;
-}
-
-
 /* ==================================================================== Legal */
 div.Legal ol {
 	list-style-position:outside;
@@ -1354,7 +1348,17 @@ table.SelectionGrid td.Active {
    border-top: 1px solid #fff;
    background: #e2f4ff;
 	padding: 4px 18px 2px;
+	position: relative;
 }
 #Foot a {
 	color: #076C8E;
 }
+.Version {
+	position: absolute;
+	bottom: 10px;
+	right: 20px;
+	color: #acddf8;
+	font-size: 12px;
+	font-weight: normal;
+}
+
diff --git a/applications/dashboard/views/admin.master.php b/applications/dashboard/views/admin.master.php
@@ -28,7 +28,6 @@
       <div id="Body">
          <div id="Panel">
             <?php
-            echo '<div class="Version">', APPLICATION, ' ', APPLICATION_VERSION, '</div>';
             $this->RenderAsset('Panel');
             ?>
          </div>
@@ -37,6 +36,7 @@
       <div id="Foot">
 			<?php
 				$this->RenderAsset('Foot');
+				echo '<div class="Version">Version ', APPLICATION_VERSION, '</div>';
 				echo Wrap(Anchor(Img('/applications/dashboard/design/images/logo_footer.png', array('alt' => 'Vanilla Forums')), C('Garden.VanillaUrl')), 'div');
 			?>
 		</div>