Enable templates in pad

7 years ago · 204e45dfae
parent 4108520d20
commit 204e45dfae
5 changed files with 18 additions and 4 deletions
--- a/customize.dist/src/less2/include/icon-colors.less
+++ b/customize.dist/src/less2/include/icon-colors.less
@ -6,7 +6,7 @@
    .cp-icon-color-slide { color: @colortheme_slide-bg; }
    .cp-icon-color-poll { color: @colortheme_poll-bg; }
    .cp-icon-color-file { color: @colortheme_file-bg; }
-    .cp-icon-color-friends { color: @colortheme_friends-bg; }
+    .cp-icon-color-contacts { color: @colortheme_friends-bg; }
    .cp-icon-color-whiteboard { color: @colortheme_whiteboard-bg; }
    .cp-icon-color-drive { color: @colortheme_drive-bg; }
    .cp-icon-color-settings { color: @colortheme_settings-bg; }
--- a/www/code/index.html
+++ b/www/code/index.html
@ -32,7 +32,6 @@
            height: 100%;
            border: 0;
        }
-
    </style>
 </head>
 <body>
--- a/www/filepicker/app-filepicker.less
+++ b/www/filepicker/app-filepicker.less
@ -2,9 +2,11 @@
@import (once) '../../customize/src/less2/include/modal.less';
@import (once) '../../customize/src/less2/include/icon-colors.less';
@import (once) '../../customize/src/less2/include/fileupload.less';
+@import (once) '../../customize/src/less2/include/alertify.less';

 .iconColors_main();
 .fileupload_main();
+.alertify_main();

 #cp-filepicker-dialog {
    display: none;
--- a/www/pad/index.html
+++ b/www/pad/index.html
@ -24,7 +24,15 @@
            padding:0;
            overflow:hidden;
        }
+        #sbox-filePicker-iframe {
+            position: fixed;
+            top:0; left:0;
+            bottom:0; right:0;
+            width:100%;
+            height: 100%;
+            border: 0;
+        }
    </style>
 </head>
 <body>
-<iframe id="sbox-iframe">
+<iframe id="sbox-iframe">
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@ -668,7 +668,12 @@ define([
            initializing = false;

            if (readOnly) { return; }
-            //TODO UserList.getLastName(toolbar.$userNameButton, newPad);
+
+
+            if (newPad) {
+                common.openTemplatePicker(common);
+            }
+
            onLocal();
            editor.focus();
            if (newPad) {