##// END OF EJS Templates
ui: added secondary action instead of two buttons on files page....
dan -
r4449:5be9b639 default
parent child Browse files
Show More
@@ -264,16 +264,15 b' input[type="button"] {'
264 264
265 265 .btn-action-switcher-container{
266 266 position: absolute;
267 top: 30px;
268 left: -82px;
267 top: 100%;
268 right: 0;
269 269 }
270 270
271 271 .btn-action-switcher {
272 272 display: block;
273 273 position: relative;
274 274 z-index: 300;
275 min-width: 240px;
276 max-width: 500px;
275 max-width: 600px;
277 276 margin-top: 4px;
278 277 margin-bottom: 24px;
279 278 font-size: 14px;
@@ -283,6 +282,7 b' input[type="button"] {'
283 282 border: 1px solid @grey4;
284 283 border-radius: 3px;
285 284 box-shadow: @dropdown-shadow;
285 overflow: auto;
286 286
287 287 li {
288 288 display: block;
@@ -17,14 +17,30 b''
17 17 </div>
18 18
19 19 % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
20 <div>
21 <a class="btn btn-primary new-file" href="${h.route_path('repo_files_upload_file',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
22 ${_('Upload File')}
23 </a>
24 <a class="btn btn-primary new-file" href="${h.route_path('repo_files_add_file',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
25 ${_('Add File')}
26 </a>
27 </div>
20
21 <div class="new-file">
22 <div class="btn-group btn-group-actions">
23 <a class="btn btn-primary no-margin" href="${h.route_path('repo_files_add_file',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
24 ${_('Add File')}
25 </a>
26
27 <a class="tooltip btn btn-primary" style="margin-left: -1px" data-toggle="dropdown" aria-pressed="false" role="button" title="${_('more options')}">
28 <i class="icon-down"></i>
29 </a>
30
31 <div class="btn-action-switcher-container">
32 <ul class="btn-action-switcher" role="menu" style="min-width: 200px">
33 <li>
34 <a class="action_button" href="${h.route_path('repo_files_upload_file',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path)}">
35 <i class="icon-upload"></i>
36 ${_('Upload File')}
37 </a>
38 </li>
39 </ul>
40 </div>
41 </div>
42 </div>
43
28 44 % endif
29 45
30 46 % if c.enable_downloads:
@@ -61,11 +61,11 b''
61 61 ##${h.secure_form(form_url, id='eform', enctype="multipart/form-data", request=request)}
62 62 <div class="edit-file-fieldset">
63 63 <div class="path-items">
64 <ul>
64 <ul class="tooltip" title="Repository path to store uploaded files. To change it, navigate to different path and click upload from there.">
65 65 <li class="breadcrumb-path">
66 66 <div>
67 67 <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path='')}"><i class="icon-home"></i></a> /
68 <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">${c.f_path}</a> ${('/' if c.f_path else '')}
68 <a href="${h.route_path('repo_files', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path)}">${c.f_path}</a>${('/' if c.f_path else '')}
69 69 </div>
70 70 </li>
71 71 <li class="location-path">
@@ -79,7 +79,7 b''
79 79 <div class="upload-form table">
80 80 <div>
81 81
82 <div class="dropzone-wrapper" id="file-uploader">
82 <div class="dropzone-wrapper" id="file-uploader" style="border: none; padding: 40px 0">
83 83 <div class="dropzone-pure">
84 84 <div class="dz-message">
85 85 <i class="icon-upload" style="font-size:36px"></i></br>
@@ -517,7 +517,7 b''
517 517 </a>
518 518
519 519 <div class="btn-action-switcher-container" id="update-commits-switcher">
520 <ul class="btn-action-switcher" role="menu">
520 <ul class="btn-action-switcher" role="menu" style="min-width: 300px;">
521 521 <li>
522 522 <a href="#forceUpdate" onclick="updateController.forceUpdateCommits(this); return false">
523 523 ${_('Force update commits')}
General Comments 0
You need to be logged in to leave comments. Login now