Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
E
ecouniversal
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Babin Egor
ecouniversal
Commits
eb896b39
Commit
eb896b39
authored
Mar 02, 2020
by
Babin Egor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove alert
parent
ade72afa
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
6 deletions
+30
-6
alert.pug
src/blocks/alert/alert.pug
+1
-0
header.pug
src/blocks/header/header.pug
+2
-1
script.js
src/js/script.js
+7
-0
orders-list-admin.pug
src/pages/orders-list-admin.pug
+1
-1
template.pug
src/pug/template.pug
+19
-4
No files found.
src/blocks/alert/alert.pug
View file @
eb896b39
...
@@ -33,6 +33,7 @@ mixin alert(title, mods)
...
@@ -33,6 +33,7 @@ mixin alert(title, mods)
+icon('i-info', '')
+icon('i-info', '')
+remove('')(class="alert__close")
+remove('')(class="alert__close")
if (typeof(title) !== 'undefined' && title !== '')
if (typeof(title) !== 'undefined' && title !== '')
.alert__header!= title
.alert__header!= title
block
block
src/blocks/header/header.pug
View file @
eb896b39
...
@@ -33,12 +33,13 @@ mixin header(isLoagin, mods)
...
@@ -33,12 +33,13 @@ mixin header(isLoagin, mods)
.header__item.header__support.header__caption
.header__item.header__support.header__caption
+icon('i-mail', 'left,c-red')
+icon('i-mail', 'left,c-red')
a(href="") Обратиться в поддержку
a(href=""
, data-toggle="modal", data-target="#modal-callback"
) Обратиться в поддержку
.header__item.header__account.header__caption
.header__item.header__account.header__caption
+icon('i-person', 'left,c-red')
+icon('i-person', 'left,c-red')
a(href="") Иванов Александр
a(href="") Иванов Александр
span.header__account-type Администратор
span.header__account-type Администратор
...
...
src/js/script.js
View file @
eb896b39
...
@@ -12,6 +12,8 @@ orderPdf.addEventListener('click', function(e)
...
@@ -12,6 +12,8 @@ orderPdf.addEventListener('click', function(e)
document
.
body
.
scrollTop
=
0
;
// For Safari
document
.
body
.
scrollTop
=
0
;
// For Safari
document
.
documentElement
.
scrollTop
=
0
;
// For Chrome, Firefox, IE and Opera
document
.
documentElement
.
scrollTop
=
0
;
// For Chrome, Firefox, IE and Opera
var
HTML_Width
=
$
(
".canvas_div_pdf"
).
width
();
var
HTML_Width
=
$
(
".canvas_div_pdf"
).
width
();
var
HTML_Height
=
$
(
".canvas_div_pdf"
).
height
();
var
HTML_Height
=
$
(
".canvas_div_pdf"
).
height
();
var
top_left_margin
=
15
;
var
top_left_margin
=
15
;
...
@@ -48,3 +50,8 @@ orderPdf.addEventListener('click', function(e)
...
@@ -48,3 +50,8 @@ orderPdf.addEventListener('click', function(e)
});
});
// удаляем ебучие заявки
function
testutest
()
{
alert
(
1
);
}
src/pages/orders-list-admin.pug
View file @
eb896b39
...
@@ -158,7 +158,7 @@ block page
...
@@ -158,7 +158,7 @@ block page
td=order.utilization_date
td=order.utilization_date
td
td
a(href="")=order.manager
a(href="")=order.manager
td #[+remove('')]
td #[+remove('')
(data-toggle="modal", data-target="#modal-order-remove", data-id='2')
]
.block_yellow-b.d-flex.justify-content-center
.block_yellow-b.d-flex.justify-content-center
+pagination()
+pagination()
...
...
src/pug/template.pug
View file @
eb896b39
...
@@ -25,8 +25,6 @@ html(class='no-js', lang="ru")
...
@@ -25,8 +25,6 @@ html(class='no-js', lang="ru")
block head
block head
link(rel='stylesheet', href='css/style.css')
link(rel='stylesheet', href='css/style.css')
script
include ../js/head-script.js
block pixel-glass-templates
block pixel-glass-templates
...
@@ -52,7 +50,7 @@ html(class='no-js', lang="ru")
...
@@ -52,7 +50,7 @@ html(class='no-js', lang="ru")
+modal('modal-callback', 'Связаться с менеджером', 'callback')
+modal('modal-callback', 'Связаться с менеджером', 'callback')
.modal__body
.modal__body
+form(data-check-form="")
+form(data-check-form=""
, id="callbackForm"
)
.block_orange-b
.block_orange-b
+field-text({
+field-text({
...
@@ -102,7 +100,7 @@ html(class='no-js', lang="ru")
...
@@ -102,7 +100,7 @@ html(class='no-js', lang="ru")
.block_orange-b
.block_orange-b
+field-actions('', '')(class="text-center")
+field-actions('', '')(class="text-center")
+btn('Отправить','primary', true)(href="#")
+btn('Отправить','primary', true)(href="#"
, id="callbackFormSub", data-dismiss='modal'
)
.modal__footer
.modal__footer
a(href="", data-dismiss='modal') Закрыть
a(href="", data-dismiss='modal') Закрыть
...
@@ -125,6 +123,23 @@ html(class='no-js', lang="ru")
...
@@ -125,6 +123,23 @@ html(class='no-js', lang="ru")
.modal__footer
.modal__footer
a(href="", data-dismiss='modal') Отменить
a(href="", data-dismiss='modal') Отменить
//- Popup удалить заявку
+modal('modal-order-remove', 'Удалить заявку', 'callback')
form(action="delete.php" method="post")
.modal__body
.block_orange-b
+field-actions('', '')(class="text-center")
+btn('Удалить','primary', true)(href="#")
.modal__footer
a(href="", data-dismiss='modal') Отменить
block page-bottom
block page-bottom
script(src='js/vue.js')
script(src='js/vue.js')
script(src='js/bundle.js')
script(src='js/bundle.js')
script(src='/js/head-script.js')
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