Commit MetaInfo

Revision982bde1b57ccf4801fb2aca3198bcfdd30719aa5 (tree)
Zeit2019-10-11 08:43:16
Autorweblocks <weblocks@user...>
Commiterweblocks

Log Message

Merge pull request #39668 (ican/weblocks/develop into develop).

Ändern Zusammenfassung

Diff

--- a/app/views/index.volt
+++ b/app/views/index.volt
@@ -23,7 +23,7 @@
2323 <div class="container-fluid">
2424 {{ content() }}
2525 <div class="row">
26- <div class="col-sm-12">
26+ <div class="col-12">
2727 <hr>
2828 <footer>
2929 <p>&copy; 2016 Weblocks project</p>
--- /dev/null
+++ b/app/views/partials/endFrame.volt
@@ -0,0 +1,8 @@
1+<!--
2+ /app/views/partials/endFrame.volt
3+ Copyright 2016 Weblocks project.
4+ This software is released under the GPL, see license.txt.
5+ https://opensource.org/licenses/gpl-license.php
6+-->
7+ </div>
8+</div>
--- /dev/null
+++ b/app/views/partials/frame.volt
@@ -0,0 +1,8 @@
1+<!--
2+ /app/views/partials/frame.volt
3+ Copyright 2016 Weblocks project.
4+ This software is released under the GPL, see license.txt.
5+ https://opensource.org/licenses/gpl-license.php
6+-->
7+<div class="row justify-content-{{ horizon }}">
8+ <div class="col-12 col-{{ width }}">
--- a/app/views/setup/database.volt
+++ b/app/views/setup/database.volt
@@ -6,15 +6,17 @@
66 -->
77 {{ partial('partials/menuBar', ['caption':'Setup Weblocks', 'link':'', 'color':'primary']) }}
88 <form class="form-horizontal" method="post" action="{{ url('setup/register') }}">
9-{{ partial('partials/select', ['caption_cols':4, 'input_cols':4, 'id':'adapter', 'caption':'Adapter', 'value':adapter, 'itemArray':adapter_select, 'onChange':'set_port()']) }}
10-{{ partial('partials/text', ['caption_cols':4, 'input_cols':4, 'id':'host', 'caption':'Host', 'value':host, 'placeholder':'enter host name or ip']) }}
11-{{ partial('partials/text', ['caption_cols':4, 'input_cols':4, 'id':'dbname', 'caption':'Database', 'value':dbname, 'placeholder':'enter database name']) }}
12-{{ partial('partials/text', ['caption_cols':4, 'input_cols':4, 'id':'port', 'caption':'Port', 'value':port, 'placeholder':'enter port number']) }}
13-{{ partial('partials/text', ['caption_cols':4, 'input_cols':4, 'id':'username', 'caption':'User', 'value':username, 'placeholder':'enter user id']) }}
14-{{ partial('partials/password', ['caption_cols':4, 'input_cols':4, 'id':'password', 'caption':'Password', 'value':password, 'placeholder':'enter password']) }}
15-{{ partial('partials/select', ['caption_cols':4, 'input_cols':4, 'id':'charset', 'caption':'Charset', 'value':charset, 'itemArray':charset_select]) }}
16-{{ partial('partials/message', ['caption_cols':4, 'input_cols':4, 'color':'alert-danger', 'message':message]) }}
17-{{ partial('partials/submit', ['caption_cols':4, 'input_cols':4, 'caption':'Submit']) }}
9+{{ partial('partials/frame', ['horizon':'center', 'width':'sm-6']) }}
10+{{ partial('partials/select', ['caption_cols':3, 'input_cols':9, 'id':'adapter', 'caption':'Adapter', 'value':adapter, 'itemArray':adapter_select, 'onChange':'set_port()']) }}
11+{{ partial('partials/text', ['caption_cols':3, 'input_cols':9, 'id':'host', 'caption':'Host', 'value':host, 'placeholder':'enter host name or ip']) }}
12+{{ partial('partials/text', ['caption_cols':3, 'input_cols':9, 'id':'dbname', 'caption':'Database', 'value':dbname, 'placeholder':'enter database name']) }}
13+{{ partial('partials/text', ['caption_cols':3, 'input_cols':9, 'id':'port', 'caption':'Port', 'value':port, 'placeholder':'enter port number']) }}
14+{{ partial('partials/text', ['caption_cols':3, 'input_cols':9, 'id':'username', 'caption':'User', 'value':username, 'placeholder':'enter user id']) }}
15+{{ partial('partials/password', ['caption_cols':3, 'input_cols':9, 'id':'password', 'caption':'Password', 'value':password, 'placeholder':'enter password']) }}
16+{{ partial('partials/select', ['caption_cols':3, 'input_cols':9, 'id':'charset', 'caption':'Charset', 'value':charset, 'itemArray':charset_select]) }}
17+{{ partial('partials/message', ['caption_cols':3, 'input_cols':9, 'color':'alert-danger', 'message':message]) }}
18+{{ partial('partials/submit', ['caption_cols':3, 'input_cols':9, 'caption':'Submit']) }}
19+{{ partial('partials/endFrame') }}
1820 </form>
1921 <script>
2022 function set_port() {
Show on old repository browser