Merge commit 'upstream/master'

Conflicts:

	modules/gallery/views/l10n_client.html.php
	modules/organize/views/organize_tree.html.php
	modules/server_add/helpers/server_add_event.php

1 files changed, 9 insertions, 13 deletions

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index 85168810..4a65d20e 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -2,10 +2,6 @@
 /*******************************************************************
  * Dialog wide stylings
  */
-#gOrganizeDialog {
-  text-align: left;
-}
-
 #gOrganize {
   overflow: hidden;
 }
@@ -51,7 +47,7 @@
   padding-left: 1.2em;
 }
 
-.gAlbumText:hover {
+.gOrganizeAlbumText:hover {
   border: 1px dashed #999;
   padding: 1px;
 }
@@ -67,14 +63,14 @@
   cursor: pointer;
 }
 
-.gAlbumText {
+.gOrganizeAlbumText {
   cursor: pointer;
   width: auto;
 }
 /*******************************************************************
  * Album Panel Styles
  */
-#gMicroThumbPanel {
+#gOrganizeMicroThumbPanel {
   margin: 0 !important;
   padding: 0 !important;
   background-color: #cfdeff;
@@ -85,11 +81,11 @@
   overflow-y: auto;
 }
 
-#gMicroThumbGrid {
+#gOrganizeMicroThumbGrid {
   padding: 1em;
 }
 
-.gMicroThumbGridCell {
+.gOrganizeMicroThumbGridCell {
   float: left;
   font-size: 0.8em;
   padding: .5em !important;
@@ -98,14 +94,14 @@
   border-right: 1px hidden #13A;
 }
 
-.gMicroThumb {
+.gOrganizeMicroThumb {
   display: block;
   height: 9em;
   text-align: center;
   width: 9em;
 }
 
-.gMicroThumbGridCell.ui-state-selected {
+.gOrganizeMicroThumbGridCell.ui-state-selected {
   opacity: 1;
 }
 
@@ -118,11 +114,11 @@
   padding: .5em;
 }
 
-#gMicroThumbPanel #gMicroThumbGrid .gAlbum {
+#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid .gAlbum {
   background-color: #e8e8e8;
 }
 
-#gMicroThumbPanel #gMicroThumbGrid :hover {
+#gOrganizeMicroThumbPanel #gOrganizeMicroThumbGrid :hover {
   opacity: 1;
 }