Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CDEK Development
cdek-warehouse
Commits
1c4a0636
Commit
1c4a0636
authored
8 years ago
by
Pavel Vinokurov
Browse files
Options
Download
Email Patches
Plain Diff
Review notes
parent
e88f4c40
phase18/pbi
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
front/cdek_front/webapp/commons/javascripts/cdek/component/ui-utils.js
+1
-0
...ont/webapp/commons/javascripts/cdek/component/ui-utils.js
front/cdek_front/webapp/shipping/shipping.ftl
+1
-0
front/cdek_front/webapp/shipping/shipping.ftl
front/cdek_front/webapp/warehouse/index.ftl
+2
-0
front/cdek_front/webapp/warehouse/index.ftl
front/cdek_front/webapp/warehouse/warehouse.ftl
+1
-0
front/cdek_front/webapp/warehouse/warehouse.ftl
with
5 additions
and
0 deletions
+5
-0
front/cdek_front/webapp/commons/javascripts/cdek/component/ui-utils.js
View file @
1c4a0636
...
...
@@ -97,6 +97,7 @@ angular.module('Utils', []).directive('splitJoinFormatter', function(){
};
//TODO refactor: javadoc + param
this
.
initSidebar
=
function
()
{
var
$sidebar
=
$
.
extend
(
$
(
'
#sidebar
'
),
{
timeoutId
:
null
,
...
...
This diff is collapsed.
Click to expand it.
front/cdek_front/webapp/shipping/shipping.ftl
View file @
1c4a0636
<#import "/spring.ftl" as spring />
<#assign security=JspTaglibs["/tld/security.tld"] />
<!-- TODO refactor: убрать-->
<#import "/sidebar/sidebar.ftl" as sidebar>
<@sidebar.panel/>
...
...
This diff is collapsed.
Click to expand it.
front/cdek_front/webapp/warehouse/index.ftl
View file @
1c4a0636
<#import "/components.ftl" as components />
<#import "/spring.ftl" as spring />
<!-- TODO refactor: перемести warehouse.ftl-->
<#import "/sidebar/sidebar.ftl" as sidebar>
<@sidebar.panel/>
...
...
This diff is collapsed.
Click to expand it.
front/cdek_front/webapp/warehouse/warehouse.ftl
View file @
1c4a0636
...
...
@@ -472,3 +472,4 @@
</div>
</div>
</div>
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help