From: Matt <matt@uncensored.citadel.org>
Date: Sat, 7 Feb 2009 06:42:02 +0000 (+0000)
Subject: * Fix user push email config
X-Git-Tag: v7.86~1485
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d7069aa427060cf5f4e3a6eb919f0a36cdda86c1

* Fix user push email config
* Roomlist styling fix: neutralize link colors, underline the current room
---

diff --git a/webcit/pushemail.c b/webcit/pushemail.c
index 2f8c6a130..5c55ddc39 100644
--- a/webcit/pushemail.c
+++ b/webcit/pushemail.c
@@ -11,8 +11,6 @@ void display_pushemail(void) {
 	int is_funambol = 0;
 	char mobnum[20];
 
-	svput("BOXTITLE", WCS_STRING, _("Push email and SMS settings"));
-	
 	/* Find any existing settings*/
 	if (goto_config_room() == 0) {
 		int msgnum = 0;
@@ -51,6 +49,11 @@ void display_pushemail(void) {
 			}
 		}
 		}
+		// TODO: do in a saner fashion. 
+		svput("PUSH_NONE", WCS_STRING, " "); // defaults
+		svput("PUSH_TEXT", WCS_STRING, " ");
+		svput("PUSH_FNBL", WCS_STRING, " ");
+		svput("SMSNUM", WCS_STRING, " ");
 	if (is_none) {
 		svput("PUSH_NONE", WCS_STRING, "checked=\"checked\"");
 	} else if (is_pager) {
diff --git a/webcit/static/t/pushemail.html b/webcit/static/t/pushemail.html
index 15711e910..e5db1a53e 100644
--- a/webcit/static/t/pushemail.html
+++ b/webcit/static/t/pushemail.html
@@ -5,7 +5,7 @@
     <div id="content" class="config_service">
     <!-- NOT beginbox -->
     <div class="box">
-    <div class="boxlabel"><?BOXTITLE><?CONTEXTSTR("X")></div>
+    <div class="boxlabel"><?_("Push email and SMS settings")></div>
     <div class="boxcontent">
 	<!-- still not begin box -->
     <!-- Begin Push email configure -->
@@ -22,15 +22,15 @@
 
         <form id="pushconfig" method="post" action="save_pushemail">
           <p class="option"><input type="radio" name="pushsetting" value=
-          "funambol" <?PUSH_FNBL>><strong>Notify Funambol server</strong></p>
+          "funambol" <?PUSH_FNBL> ><strong>Notify Funambol server</strong></p>
 
           <p class="option"><input type="radio" name="pushsetting" value=
-          "textmessage" <?PUSH_TEXT>><strong>Send a text message</strong> to... <input type="text"
+          "textmessage" <?PUSH_TEXT> ><strong>Send a text message</strong> to... <input type="text"
           name="user_sms_number" size="20" <?SMSNUM> > (Use international format, without any
           leading zeros, spaces or hypens, like +61415011501)</p>
 
           <p class="option"><input type="radio" name="pushsetting" value=
-          "none" <?PUSH_NONE>><strong>Don't send any notifications</strong></p>
+          "none" <?PUSH_NONE> ><strong>Don't send any notifications</strong></p>
 
           <p><input type="submit" name="submit" value="Save settings"></p>
         </form>
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 870ca031d..4e2d2976e 100644
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -197,6 +197,10 @@ function switch_to_menu_buttons() {
 }
 function IconBarRoomList() {
   var currentExpanded = ctdlLocalPrefs.readPref("rooms_expanded");
+  var curRoomName = "";
+  if (document.getElementById("rmname")) {
+    curRoomName = getTextContent(document.getElementById("rmname"));
+  }
   currentDropTargets = new Array();
   var iconbar = document.getElementById("iconbar");
   roomlist = document.getElementById("roomlist");
@@ -216,7 +220,7 @@ function IconBarRoomList() {
   var mailboxRooms = GetMailboxRooms();
   for(var i=0; i<mailboxRooms.length; i++) {
     var room = mailboxRooms[i];
-    currentDropTargets.push(addRoomToList(mailboxUL, room));
+    currentDropTargets.push(addRoomToList(mailboxUL, room, curRoomName));
   }
   if (currentExpanded != null && currentExpanded == _mailbox ) {
     expandFloor(mailboxSPAN);
@@ -237,7 +241,7 @@ function IconBarRoomList() {
     var roomsForFloor = GetRoomsByFloorNum(floornum);
     for(var b=0; b<roomsForFloor.length; b++) {
       var room = roomsForFloor[b];
-      currentDropTargets.push(addRoomToList(floorUL, room));
+      currentDropTargets.push(addRoomToList(floorUL, room, curRoomName));
     }
     if (currentExpanded != null && currentExpanded == name) {
       expandFloor(floorSPAN);
@@ -245,7 +249,7 @@ function IconBarRoomList() {
   }
 }
 
-function addRoomToList(floorUL,room) {
+function addRoomToList(floorUL,room, roomToEmphasize) {
   var roomName = room[RN_ROOM_NAME];
   var flag = room[RN_ROOM_FLAG];
   var curView = room[RN_CUR_VIEW];
@@ -275,6 +279,9 @@ function addRoomToList(floorUL,room) {
   if (hasNewMsgs) {
     className += " room-newmsgs";
   }
+  if (roomName == roomToEmphasize) {
+    className += " room-emphasized";
+  }
   roomLI.setAttribute("class", className);
   roomA.dropTarget = true;
   roomA.dropHandler = roomListDropHandler;
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 91ea445fa..915b21a05 100644
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -886,7 +886,8 @@ body, #global {
     padding: 0;
 }
 /** Override to disable list-style-image" */
-.room {
+.room a, .room a, .room a:visited, .room a:link {
+    color: #333333;
 }
 .room-private {
     list-style-image: url("/static/privatemess_16x.gif");
@@ -909,6 +910,9 @@ body, #global {
 .room-newmsgs {
     font-weight: bold;
 }
+.room-emphasized {
+    text-decoration: underline;
+}
 /* Content */
 
 .boxcontent table {