From 5add1c5a81ab04e7285d632a63a9af80e0b7d0f6 Mon Sep 17 00:00:00 2001 From: Simon Eisenmann Date: Tue, 17 Jun 2014 15:12:31 +0200 Subject: [PATCH] Implemented user defined subline. --- .../js/controllers/mediastreamcontroller.js | 4 +- static/js/services/buddylist.js | 22 +++- static/partials/buddy.html | 4 +- static/partials/buddyactions.html | 10 +- static/partials/settings.html | 113 ++++++++++-------- 5 files changed, 93 insertions(+), 60 deletions(-) diff --git a/static/js/controllers/mediastreamcontroller.js b/static/js/controllers/mediastreamcontroller.js index 99b8f80a..ecb62a3e 100644 --- a/static/js/controllers/mediastreamcontroller.js +++ b/static/js/controllers/mediastreamcontroller.js @@ -139,6 +139,7 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'webrtc.adapter'], function $scope.master = { displayName: null, buddyPicture: null, + message: null, settings: { videoQuality: "high", stereo: true, @@ -175,7 +176,8 @@ define(['underscore', 'bigscreen', 'moment', 'sjcl', 'webrtc.adapter'], function // This is the user status. var status = { displayName: $scope.master.displayName || null, - buddyPicture: $scope.master.buddyPicture || null + buddyPicture: $scope.master.buddyPicture || null, + message: $scope.master.message || null } if (_.isEqual(status, cache.status)) { console.log("Status update skipped, as status has not changed.") diff --git a/static/js/services/buddylist.js b/static/js/services/buddylist.js index 93e997cc..1475a0c9 100644 --- a/static/js/services/buddylist.js +++ b/static/js/services/buddylist.js @@ -435,7 +435,7 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text! display.buddyPicture = status.buddyPicture; this.updateBuddyPicture(display); // Set display subline. - display.subLine = data.Ua; + this.updateSubline(display, status.message); // Add to render queue when no element exists. if (!scope.element) { var before = this.tree.add(id, scope); @@ -462,8 +462,8 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text! this.queue.push([queueName, id, before]); } // Update display subline. - if (data.Ua) { - display.subLine = data.Ua; + if (status.message) { + this.updateSubline(display, status.message); } // Update display picture. display.buddyPicture = status.buddyPicture || null; @@ -471,6 +471,22 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text! }; + Buddylist.prototype.updateSubline = function(display, s) { + + if (!s || s === "__none__") { + display.subline = ""; + return; + } + if (s.length > 20) { + display.sublineFull = s; + s = s.substr(0, 20) + "..."; + } else { + display.sublineFull = null; + } + display.subline = s; + + }; + Buddylist.prototype.onStatus = function(data) { //console.log("onStatus", data); diff --git a/static/partials/buddy.html b/static/partials/buddy.html index d566c41d..3f059dda 100644 --- a/static/partials/buddy.html +++ b/static/partials/buddy.html @@ -1,5 +1,5 @@ -
+
{{session.Id|displayName}}
-
({{session.count}}) {{display.subLine}}
+
({{session.count}}) {{display.subline}}
diff --git a/static/partials/buddyactions.html b/static/partials/buddyactions.html index df4aa7a0..c3e7d74b 100644 --- a/static/partials/buddyactions.html +++ b/static/partials/buddyactions.html @@ -1,11 +1,11 @@
- - + +
- +
diff --git a/static/partials/settings.html b/static/partials/settings.html index 1bb159f7..6bde5261 100644 --- a/static/partials/settings.html +++ b/static/partials/settings.html @@ -3,7 +3,7 @@
- {{_('Settings')}} + {{_('Profile')}}
@@ -16,69 +16,84 @@
- {{_('Your picture and name are visible to others.')}} +
+
+
+ +
+ +
+
+
+
+ {{_('Profile information is public.')}}
-
- -
-
-
- - - -
-
- 
{{userid}}
- {{_('Authenticated by certificate. To log out you have to remove your certificate from the browser.')}} -
-
-
-
- -
-
-
-
- -
- +
+ {{_('Media')}} +
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
-
- - - +
+ +
+
+ + + +
-
+ {{_('Settings')}}