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

2 files changed, 112 insertions, 0 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
new file mode 100644
index 00000000..ca90a484
--- /dev/null
+++ b/lib/gallery.common.css
@@ -0,0 +1,111 @@
+/* ####### states, interactions, positioning ########### */
+
+/* states */
+
+.g-active,   .g-enabled,  .g-available,   .g-editable,              .g-selected,   .g-highlight {
+  font-weight: bold;
+}
+.g-inactive, .g-disabled, .g-unavailable, .g-uneditable, .g-locked, .g-unselected, .g-understate {
+  color: #ccc;
+  font-weight: normal;
+}
+
+.g-error, .g-denied {
+	
+}
+.g-success, .g-allowed {
+	
+}
+.g-info {
+	
+}
+.g-warning {
+	
+}
+
+.g-open {
+	
+}
+.g-closed {
+	
+}
+
+.g-installed {
+	
+}
+.g-default {
+	
+}
+
+/* interactions */
+
+.g-draggable, .ui-draggable {
+	cursor: move;
+}
+.g-target {
+	
+}
+
+
+
+/* positioning */
+
+.g-right {
+	float: right;
+}
+.g-left {
+	float: left;
+}
+
+/* order */
+
+.g-first {
+	
+}
+.g-last {
+	
+}
+.g-even-row {
+  
+}
+.g-odd-row {
+	
+}
+
+/* text */
+
+.g-txt-small {
+	font-size: .8em;
+}
+.g-txt-big {
+	font-size: 1.2em;
+}
+.g-txt-right {
+	text-align: right;
+}
+
+/* ####### reusable containers/widgets ########### */
+
+.g-dialog {
+	
+}
+
+.g-button { /* a link styled like a button */
+	
+}
+
+.g-progressbar {
+	
+}
+
+.g-block {
+	
+}
+
+.g-message-box {
+	
+}
+
+.g-list-horizontal {
+	
+}
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 67f3f02d..39c451e3 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -76,6 +76,7 @@
        var eCancel = '<a href="#" class="gCancel">' + MSG_CANCEL + '</a>';
        if ($("#gDialog .submit").length) {
          $("#gDialog .submit").addClass("ui-state-default ui-corner-all");
+         $.fn.gallery_hover_init();
          $("#gDialog .submit").parent().append(eCancel);
          $("#gDialog .gCancel").click(function(event) {
            $("#gDialog").dialog("close");