scratch – Diff between revs 131 and 132

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 131 Rev 132
Line 41... Line 41...
41 <h1>scratch copy</h1> 41 <h1>scratch copy</h1>
42 <p class="quote">the asset sharer</p> 42 <p class="quote">the asset sharer</p>
43 </div> 43 </div>
Line 44... Line 44...
44   44  
45 <div class="container"> 45 <div class="container">
46 46
47 <ul class="nav nav-tabs"> 47 <ul class="nav nav-tabs">
48 <li><a href="index.html">Home</a></li> 48 <li><a href="index.html">Home</a></li>
49 <li class="active"><a href="#">File</a></li> 49 <li class="active"><a href="#">File</a></li>
50 <li><a href="text.html">Text</a></li> 50 <li><a href="text.html">Text</a></li>
51 <li><a href="draw.html">Draw</a></li> 51 <li><a href="draw.html">Draw</a></li>
52 <li><a href="link.html">Link</a></li> 52 <li><a href="link.html">Link</a></li>
53 <li><a href="view.html">View</a></li> 53 <li><a href="view.html">View</a></li>
Line 54... Line -...
54 </ul> -  
55 54 </ul>
56 <form data-toggle="validator" role="form" id="file-form-upload"> 55
57 <div id="main-panel" class="panel panel-default"> 56 <div id="main-panel" class="panel panel-default">
58 <div class="panel-heading"> 57 <div class="panel-heading">
59 <div id="actions" class="row"> 58 <div id="actions" class="row">
60 <div class="col-lg-5"> 59 <div class="col-lg-5">
61 <div class="btn-group btn-group-justified" role="group"> 60 <div class="btn-group btn-group-justified" role="group">
62 <!-- The fileinput-button span is used to style the file input field as button --> 61 <!-- The fileinput-button span is used to style the file input field as button -->
63 <div class="btn-group" role="group"> 62 <div class="btn-group" role="group">
64 <button id="uploadbutton" type="button" class="btn btn-default"> 63 <button id="uploadbutton" type="button" class="btn btn-default">
65 <i class="glyphicon glyphicon-plus"></i> 64 <i class="glyphicon glyphicon-plus"></i>
66 <span>Add...</span> 65 <span>Add...</span>
67 </button> 66 </button>
68 </div> 67 </div>
69 <div class="btn-group" role="group"> 68 <div class="btn-group" role="group">
70 <button type="submit" class="btn btn-default start"> 69 <button type="submit" class="btn btn-default start">
71 <i class="glyphicon glyphicon-upload"></i> 70 <i class="glyphicon glyphicon-upload"></i>
72 <span>Upload All</span> 71 <span>Upload All</span>
73 </button> 72 </button>
74 </div> 73 </div>
75 <div class="btn-group" role="group"> 74 <div class="btn-group" role="group">
76 <button type="reset" class="btn btn-danger cancel"> 75 <button type="reset" class="btn btn-danger cancel">
77 <i class="glyphicon glyphicon-ban-circle"></i> 76 <i class="glyphicon glyphicon-ban-circle"></i>
78 <span>Cancel All</span> -  
79 </button> 77 <span>Cancel All</span>
80 </div> 78 </button>
81 </div> 79 </div>
82 </div> 80 </div>
-   81 </div>
83 </div> 82 </div>
84 </div> 83 </div>
85 <div class="panel-body" id="uploadpanel"> 84 <div class="panel-body" id="uploadpanel">
86 <div class="table table-striped files" id="previews"> 85 <div class="table table-striped files" id="previews">
87 <div id="template" class="file-row"> 86 <div id="template" class="file-row">
88 <!-- This is used as the file preview template --> 87 <!-- This is used as the file preview template -->
89 <div> 88 <div>
90 <span class="preview"><img src="img/fileholder.svg" width="58" alt="Upload file thumbnail" data-dz-thumbnail></span> 89 <span class="preview"><img src="img/fileholder.svg" width="58" alt="Upload file thumbnail" data-dz-thumbnail></span>
91 </div> 90 </div>
92 <div> 91 <div>
93 <p class="upload-filename" data-dz-name></p> 92 <p class="upload-filename" data-dz-name></p>
94 <label for="file-upload-url">Download URL:</label> 93 <label for="file-upload-url">Download URL:</label>
95 <div class="input-group"> 94 <div class="input-group">
96 <input id="file-upload-url" type="text" class="form-control upload-url" readonly> 95 <input id="file-upload-url" type="text" class="form-control upload-url" readonly>
97 <span class="input-group-btn"> 96 <span class="input-group-btn">
98 <button id="btn-mailto" class="btn btn-default url-mailto-button" type="button"><i class="glyphicon glyphicon-envelope"></i></button> 97 <button id="btn-mailto" class="btn btn-default url-mailto-button" type="button"><i class="glyphicon glyphicon-envelope"></i></button>
99 </span> 98 </span>
100 <span class="input-group-btn"> 99 <span class="input-group-btn">
101 <button id="btn-facebook" class="btn btn-default url-facebook-button" type="button" disabled><i class="fa fa-facebook"></i></button> 100 <button id="btn-facebook" class="btn btn-default url-facebook-button" type="button" disabled><i class="fa fa-facebook"></i></button>
102 </span> 101 </span>
103 <span class="input-group-btn"> -  
104 <button id="btn-clipboard" class="btn btn-default url-clipboard-button" type="button"><i class="glyphicon glyphicon-paperclip"></i></button> -  
105 </span> -  
106 </div> -  
107 <label for="file-upload-url">Delete URL:</label> -  
108 <div class="input-group"> -  
109 <input id="file-delete-url" type="text" class="form-control delete-url" readonly> -  
110 <span class="input-group-btn"> 102 <span class="input-group-btn">
111 <button id="btn-clipboard-delete" class="btn btn-default delete-cliboard-button" type="button"><i class="glyphicon glyphicon-paperclip"></i></button> -  
112 </span> -  
113 </div> -  
114 <label for="file-tags">Tags:</label> -  
115 <div class="input-group"> -  
116 <select id="file-tags" multiple class="form-control file-tags"></select> -  
117 </div> -  
118 <strong class="error text-danger" data-dz-errormessage></strong> -  
119 </div> -  
120 <div> -  
121 <p class="size" data-dz-size></p> -  
122 <div id="progress" class="progress active" role="progressbar"> -  
123 <div class="progress-bar progress-bar-custom" style="width:0%;" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0" data-dz-uploadprogress></div> -  
124 </div> -  
125 </div> -  
126 <div> -  
127 <button id="start" class="btn btn-default start"> -  
128 <i class="glyphicon glyphicon-upload"></i> -  
129 <span>Upload</span> -  
130 </button> -  
131 <button id="cancel" data-dz-remove class="btn btn-warning cancel"> -  
132 <i class="glyphicon glyphicon-ban-circle"></i> -  
133 <span>Cancel</span> -  
134 </button> -  
135 <button id="remove" data-dz-remove class="btn btn-danger remove"> -  
136 <i class="glyphicon glyphicon-remove"></i> -  
137 <span>Remove</span> 103 <button id="btn-clipboard" class="btn btn-default url-clipboard-button" type="button"><i class="glyphicon glyphicon-paperclip"></i></button>
-   104 </span>
-   105 </div>
-   106 <label for="file-upload-url">Delete URL:</label>
-   107 <div class="input-group">
-   108 <input id="file-delete-url" type="text" class="form-control delete-url" readonly>
-   109 <span class="input-group-btn">
138 </button> 110 <button id="btn-clipboard-delete" class="btn btn-default delete-cliboard-button" type="button"><i class="glyphicon glyphicon-paperclip"></i></button>
-   111 </span>
-   112 </div>
-   113 <label for="file-tags">Tags:</label>
-   114 <div class="input-group">
-   115 <select id="file-tags" multiple class="form-control file-tags"></select>
-   116 </div>
-   117 <strong class="error text-danger" data-dz-errormessage></strong>
-   118 </div>
-   119 <div>
-   120 <p class="size" data-dz-size></p>
-   121 <div id="progress" class="progress active" role="progressbar">
-   122 <div class="progress-bar progress-bar-custom" style="width:0%;" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0" data-dz-uploadprogress></div>
-   123 </div>
-   124 </div>
-   125 <div>
-   126 <button id="start" class="btn btn-default start">
-   127 <i class="glyphicon glyphicon-upload"></i>
-   128 <span>Upload</span>
-   129 </button>
-   130 <button id="cancel" data-dz-remove class="btn btn-warning cancel">
-   131 <i class="glyphicon glyphicon-ban-circle"></i>
-   132 <span>Cancel</span>
-   133 </button>
-   134 <button id="remove" data-dz-remove class="btn btn-danger remove">
-   135 <i class="glyphicon glyphicon-remove"></i>
139 </div> 136 <span>Remove</span>
140 </div> 137 </button>
-   138 </div>
-   139 </div>
141 </div> 140 </div>
142 </div> 141 </div>
143 <!-- The global file processing state --> 142 <!-- The global file processing state -->
144 <div class="fileupload-process"> 143 <div class="fileupload-process">
145 <div id="total-progress" class="progress active" role="progressbar"> -  
146 <div class="progress-bar progress-bar-custom" style="width:0%;" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0" data-dz-uploadprogress></div> 144 <div id="total-progress" class="progress active" role="progressbar">
-   145 <div class="progress-bar progress-bar-custom" style="width:0%;" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0" data-dz-uploadprogress></div>
147 </div> 146 </div>
148 </div> -  
149 </form> 147 </div>
Line 150... Line 148...
150   148 </div>
151 </div> <!-- /container --> 149 </div> <!-- /container -->
152 150
Line 160... Line 158...
160 <script src="bower_components/jquery/dist/jquery.min.js"></script> 158 <script src="bower_components/jquery/dist/jquery.min.js"></script>
161 <!-- Angular JS --> 159 <!-- Angular JS -->
162 <script src="bower_components/angular/angular.min.js"></script> 160 <script src="bower_components/angular/angular.min.js"></script>
163 <!-- BootStrap --> 161 <!-- BootStrap -->
164 <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> 162 <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
165 <!-- BootStrap Validator --> -  
166 <script src="bower_components/bootstrap-validator/dist/validator.min.js"></script> -  
167 <!-- DropZone --> 163 <!-- DropZone -->
168 <script src="bower_components/dropzone/dist/min/dropzone.min.js"></script> 164 <script src="bower_components/dropzone/dist/min/dropzone.min.js"></script>
169 <!-- Clipboard --> 165 <!-- Clipboard -->
170 <script src="bower_components/clipboard/dist/clipboard.min.js"></script> 166 <script src="bower_components/clipboard/dist/clipboard.min.js"></script>
171 <!-- TagsInput --> 167 <!-- TagsInput -->
Line 221... Line 217...
221 const tagsContainerID = file 217 const tagsContainerID = file
222 .previewElement 218 .previewElement
223 .querySelector('.bootstrap-tagsinput') 219 .querySelector('.bootstrap-tagsinput')
224 .getAttribute('id'); 220 .getAttribute('id');
Line -... Line 221...
-   221
-   222 $('#' + tagsBoxID).attr('readonly', 'readonly');
225 223 $('#' + tagsBoxID).attr('disabled', 'disabled');
226 $('#' + tagsContainerID).attr('readonly', 'readonly'); 224 $('#' + tagsContainerID).attr('readonly', 'readonly');
Line 227... Line 225...
227 $('#' + tagsContainerID).attr('disabled', 'disabled'); 225 $('#' + tagsContainerID).attr('disabled', 'disabled');
228 226