Merge branch 'download' into cacheRT

customize.dist/loading.js

@@ -241,7 +241,7 @@ p.cp-password-info{
     animation-timing-function: cubic-bezier(.6,0.15,0.4,0.85);
 }
 
-button.primary{
+button:not(.btn).primary{
     border: 1px solid #4591c4;
     padding: 8px 12px;
     text-transform: uppercase;
@@ -250,7 +250,7 @@ button.primary{
     font-weight: bold;
 }
 
-button.primary:hover{
+button:not(.btn).primary:hover{
     background-color: rgb(52, 118, 162);
 }
 

www/common/inner/properties.js

@@ -12,6 +12,8 @@ define([
              Messages, nThen) {
     var Properties = {};
 
+    Messages.documentID = Messages.documentID || 'Document identifier'; // XXX
+
     var getPadProperties = function (Env, data, opts, _cb) {
         var cb = Util.once(Util.mkAsync(_cb));
         var common = Env.common;
@@ -19,6 +21,13 @@ define([
         var $d = $('<div>');
         if (!data) { return void cb(void 0, $d); }
 
+        if (data.channel) {
+            $('<label>', { 'for': 'cp-app-prop-id'}).text(Messages.documentID).appendTo($d);
+            $d.append(UI.dialog.selectable(data.channel, {
+                id: 'cp-app-prop-id',
+            }));
+        }
+
         if (data.href) {
             $('<label>', {'for': 'cp-app-prop-link'}).text(Messages.editShare).appendTo($d);
             $d.append(UI.dialog.selectable(data.href, {

www/common/translations/messages.fr.json

@@ -1468,5 +1468,6 @@
     "loading_state_0": "Construction de l'interface",
     "tag_edit": "Modifier",
     "tag_add": "Ajouter",
-    "error_unhelpfulScriptError": "Erreur de script : consultez la console du navigateur pour plus de détails"
+    "error_unhelpfulScriptError": "Erreur de script : consultez la console du navigateur pour plus de détails",
+    "documentID": "Référence du document"
 }

www/common/translations/messages.json

@@ -1468,5 +1468,6 @@
     "loading_state_5": "Reconstruct document",
     "tag_add": "Add",
     "tag_edit": "Edit",
-    "error_unhelpfulScriptError": "Script Error: See browser console for details"
+    "error_unhelpfulScriptError": "Script Error: See browser console for details",
+    "documentID": "Document identifier"
 }