svatbonet/wireframe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drobne bugfixy

Browse Source
This commit is contained in:
Michal Kváček
2018-11-28 00:06:27 +01:00
parent 89f19c3931
commit dccbfd6764
5 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app.js
+2
View File
@@ -44,6 +44,8 @@ var templateData = {
{name: "Ukol 3", done: true}, {name: "Ukol 3", done: true},
{name: "Ukol 4", done: false}, {name: "Ukol 4", done: false},
], ],
galleryText: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
galleryName: "Svatební cesta",
aboutUs: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", aboutUs: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
notes: "", notes: "",
wedding: { wedding: {
src/assets/scss/boxes.scss
+7 -1
View File
@@ -7,7 +7,13 @@
padding: 20px; padding: 20px;
} }
&__item { @media (max-width: 1100px) {
&__container {
column-count: 1;
}
}
&__item {
margin-bottom: 20px; margin-bottom: 20px;
} }
src/views/editor/gallery_detail.ejs
+7 -15
View File
@@ -1,45 +1,37 @@
<section class="web-part container"> <section class="web-part container">
<h2>Nadpis alba</h2> <h2><%= galleryName %></h2>
<article> <article>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et <%- galleryText %>
dolore
magna aliqua. Ut enim ad minim veniam, quis
nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
reprehenderit in voluptate velit esse cillum dolore eu fugiat
nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit
anim
id est laborum.</p>
</article> </article>
<% include ../partials/editor/modals/editGalleryText.ejs %> <% include ../partials/editor/modals/editGalleryText.ejs %>
<div class="btn-toolbar justify-content-center my-5" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-toolbar justify-content-center my-5" role="toolbar" aria-label="Toolbar with button groups">
<!--<div class="btn-group" role="group" aria-label="First group">--> <!--<div class="btn-group" role="group" aria-label="First group">-->
<button type="button" class="btn js-move-button-trigger btn-secondary"> <button type="button" class="btn m-3 js-move-button-trigger btn-secondary">
<i class="fa fa-arrows"></i> <i class="fa fa-arrows"></i>
Přesunout fotografie Přesunout fotografie
</button> </button>
<button type="button" class="btn js-move-done-button-trigger btn-primary" hidden> <button type="button" class="btn m-3 js-move-done-button-trigger btn-primary" hidden>
Hotovo Hotovo
</button> </button>
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#newPhotoModal"> <button type="button" class="btn m-3 btn-primary" data-toggle="modal" data-target="#newPhotoModal">
<i class="fa fa-plus"></i> Nahrát fotografie <i class="fa fa-plus"></i> Nahrát fotografie
</button> </button>
<button type="button" class="btn js-delete-button-trigger btn-danger"> <button type="button" class="btn m-3 js-delete-button-trigger btn-danger">
Smazat fotografie Smazat fotografie
</button> </button>
<button type="button" class="btn js-delete-button-confirmation btn-primary" data-toggle="modal" data-target="#deletePhotosModal" hidden> <button type="button" class="btn m-3 js-delete-button-confirmation btn-primary" data-toggle="modal" data-target="#deletePhotosModal" hidden>
Odstranit vybrané Odstranit vybrané
</button> </button>
<!--</div>--> <!--</div>-->
</div> </div>
<%- include('../partials/notification.ejs', {parameter: "upload"}) %> <%- include('../partials/notification.ejs', {parameter: "upload"}) %>
<a name="program"></a> <a name="program"></a>
src/views/partials/editor/modals/editGalleryText.ejs
+30 -21
View File
@@ -1,27 +1,36 @@
<div class="web-part__edit"> <div class="web-part__edit">
<a href="#aboutUsModal" data-toggle="modal" data-target="#aboutUsModal"> <a href="#aboutUsModal" data-toggle="modal" data-target="#aboutUsModal">
<i class="fa fa-pencil-square"></i> <i class="fa fa-pencil-square"></i>
</a> </a>
</div> </div>
<div class="modal fade" id="aboutUsModal" tabindex="-1" role="dialog" aria-labelledby="aboutUsModalLabel" aria-hidden="true"> <div class="modal fade" id="aboutUsModal" tabindex="-1" role="dialog" aria-labelledby="aboutUsModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="aboutUsModalLabel">Editovat text</h5> <h5 class="modal-title" id="aboutUsModalLabel">Editovat text</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
<div class="modal-body"> <form method="post">
<textarea class="wysiwyg" name="aboutUs"></textarea> <div class="modal-body">
</div>
<div class="modal-footer"> <label>Jméno alba
<button type="button" class="btn btn-secondary" data-dismiss="modal">Storno</button> </label>
<button type="button" class="btn btn-primary" data-dismiss="modal">Uložit
</button> <input type="text" name="galleryName" class="form-control" value="<%= galleryName %>">
</div>
</div> <label>Popis</label>
</div> <textarea class="wysiwyg" name="galleryText"><%= galleryText %></textarea>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Storno</button>
<button type="submit" class="btn btn-primary">Uložit
</button>
</div>
</form>
</div>
</div>
</div> </div>
src/views/partials/program-icons.ejs
+2 -2
View File
@@ -2,7 +2,7 @@
<div class="modal fade" id="setIconProgramModal" tabindex="-1" role="dialog" aria-labelledby="setIconProgramModal" aria-hidden="true"> <div class="modal fade" id="setIconProgramModal" tabindex="-1" role="dialog" aria-labelledby="setIconProgramModal" aria-hidden="true">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body text-center">
<% var icons = ['gear', 'home', 'automobile', 'bell', 'bullhorn', 'child', 'coffee', 'diamond', 'film', 'camera', <% var icons = ['gear', 'home', 'automobile', 'bell', 'bullhorn', 'child', 'coffee', 'diamond', 'film', 'camera',
'camera-retro', 'fire', 'birthday-cake', 'heart', 'image', 'map', 'map-marker', 'map-o', 'camera-retro', 'fire', 'birthday-cake', 'heart', 'image', 'map', 'map-marker', 'map-o',
@@ -11,7 +11,7 @@
<% for (var i in icons) { %> <% for (var i in icons) { %>
<a href="javascript:void(0);" data-icon="<%= icons[i] %>" class="js-choose-icon"><i class="fa fa-3x fa-<%= icons[i] %>"></i></a> <a href="javascript:void(0);" data-icon="<%= icons[i] %>" class="js-choose-icon"><i class="fa fa-fw fa-3x fa-<%= icons[i] %>" style="margin: 10px"></i></a>
<% } %> <% } %>