From 71e9efb152c07838574f731e184a323236b51358 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 25 Feb 2012 15:52:08 +0000
Subject: Add titles to error and photo upload popups (#1488354)

---
 program/localization/de_CH/labels.inc   | 1 +
 program/localization/de_CH/messages.inc | 1 +
 program/localization/de_DE/labels.inc   | 1 +
 program/localization/de_DE/messages.inc | 1 +
 program/localization/en_US/labels.inc   | 1 +
 program/localization/en_US/messages.inc | 1 +
 skins/larry/includes/footer.html        | 1 +
 skins/larry/templates/contactedit.html  | 2 +-
 skins/larry/ui.js                       | 2 +-
 9 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index cdd93da5d..c2c2caddb 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -272,6 +272,7 @@ $labels['delete'] = 'Löschen';
 $labels['rename'] = 'Umbenennen';
 $labels['addphoto'] = 'Hinzufügen';
 $labels['replacephoto'] = 'Ersetzen';
+$labels['uploadphoto'] = 'Bild hochladen';
 $labels['newcontact'] = 'Neuen Kontakt erfassen';
 $labels['deletecontact'] = 'Gewählte Kontakte löschen';
 $labels['composeto'] = 'Nachricht verfassen';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index c130f7f39..018af1c5c 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -15,6 +15,7 @@
 */
 
 $messages = array();
+$messages['errortitle']  = 'Fehlermeldung';
 $messages['loginfailed'] = 'Login fehlgeschlagen';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
 $messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index ba5b52c06..196d87ce6 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -272,6 +272,7 @@ $labels['delete'] = 'Löschen';
 $labels['rename'] = 'Umbenennen';
 $labels['addphoto'] = 'Kontaktbild hinzufügen';
 $labels['replacephoto'] = 'Bild ändern';
+$labels['uploadphoto'] = 'Bild hochladen';
 $labels['newcontact'] = 'Neuen Kontakt erstellen';
 $labels['deletecontact'] = 'Gewählte Kontakte löschen';
 $labels['composeto'] = 'Nachricht verfassen';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index dc8811686..fe9f48ec9 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -15,6 +15,7 @@
 */
 
 $messages = array();
+$messages['errortitle']  = 'Fehlermeldung';
 $messages['loginfailed'] = 'Die Anmeldung ist fehlgeschlagen.';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies.';
 $messages['sessionerror'] = 'Ihre Sitzung ist ungültig oder abgelaufen.';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index f9b2d9b94..218207440 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -322,6 +322,7 @@ $labels['delete'] = 'Delete';
 $labels['rename'] = 'Rename';
 $labels['addphoto'] = 'Add';
 $labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
 
 $labels['newcontact']     = 'Create new contact card';
 $labels['deletecontact']  = 'Delete selected contacts';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index f22b1e29a..7125c1451 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -21,6 +21,7 @@
 */
 
 $messages = array();
+$messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'Login failed.';
 $messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
 $messages['sessionerror'] = 'Your session is invalid or expired.';
diff --git a/skins/larry/includes/footer.html b/skins/larry/includes/footer.html
index f884bdf82..4a6f8f09c 100644
--- a/skins/larry/includes/footer.html
+++ b/skins/larry/includes/footer.html
@@ -3,6 +3,7 @@
 // UI startup
 var UI = new rcube_mail_ui();
 $(document).ready(function(){
+	UI.set('errortitle', '<roundcube:label name="errortitle" />');
 	UI.init();
 });
 
diff --git a/skins/larry/templates/contactedit.html b/skins/larry/templates/contactedit.html
index 4bea55bf7..39d48440b 100644
--- a/skins/larry/templates/contactedit.html
+++ b/skins/larry/templates/contactedit.html
@@ -41,7 +41,7 @@
 	<roundcube:button name="cancel" type="input" class="button" label="cancel" onclick="history.back()" condition="env:action=='add'" />
 </div>
 
-<div id="upload-dialog" class="propform popupdialog">
+<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='uploadphoto' />">
 	<roundcube:object name="photoUploadForm" id="upload-form" size="30" buttons="no" />
 	<div class="formbuttons">
 		<roundcube:button command="upload-photo" type="input" class="button mainaction" label="upload" />
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 86c1b0cdb..759bfabe1 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -251,7 +251,7 @@ function rcube_mail_ui()
           resizable: false,
           closeOnEscape: true,
           dialogClass: 'popupmessage ' + p.type,
-          title: null,
+          title: env.errortitle,
           close: function() {
             me.messagedialog.dialog('destroy').hide();
           },
-- 
cgit v1.2.3