Skip to content
Snippets Groups Projects
Verified Commit 6fb61d74 authored by Andrej Ramašeuski's avatar Andrej Ramašeuski
Browse files

Merge branch 'stage'

parents 9dd46232 7f6d08ee
No related branches found
No related tags found
No related merge requests found
Pipeline #9251 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
VERSION
+ 1
− 1
View file @ 6fb61d74
1.0.0 1.0.1
templates/layouts/default.html.ep
+ 3
− 0
View file @ 6fb61d74
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
</head> </head>
<body> <body>
<nav class="navbar navbar--simple __js-root"> <nav class="navbar navbar--simple __js-root">
<ui-app inline-template> <ui-app inline-template>
<ui-navbar inline-template> <ui-navbar inline-template>
...@@ -101,5 +102,7 @@ ...@@ -101,5 +102,7 @@
</section> </section>
</div> </div>
<script src="https://cdn-unpkg.pirati.cz/vue@2.7.8/dist/vue.min.js"></script>
<script src="<%= $c->config->{styleguide} %>js/main.bundle.js"></script>
</body> </body>
</html> </html>
templates/shortcuts.html.ep
+ 4
− 4
View file @ 6fb61d74
...@@ -77,16 +77,16 @@ $(function() { ...@@ -77,16 +77,16 @@ $(function() {
}, },
fields: [ fields: [
{ name: "shortcut", title: "Zkratka", type: "text", width: 50, editing: false }, { name: "shortcut", title: "Zkratka", type: "text", width: '5em', editing: false },
{ name: "url", title: "URL", type: "text", width: 250, validate: "url" }, { name: "url", title: "URL", type: "text", width: '100%', validate: "url" },
{ name: "code", title: "Týp přesměrování", type: "select", width: 70, items: [ { name: "code", title: "Typ přesměrování", type: "select", width: '10em', items: [
{ name: "302 dočasné", code: 302 }, { name: "302 dočasné", code: 302 },
{ name: "301 trvalé", code: 301 }, { name: "301 trvalé", code: 301 },
], ],
valueField: "code", valueField: "code",
textField: "name" textField: "name"
}, },
{ type: "control", editButton: false, width: 30 } { type: "control", editButton: false, width: 60 }
] ]
}); });
}); });
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Pirátský GitLab - Home of the CopyLeft