Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-20 21:59:42 +02:00
Code Releases Activity

setup wizard UI tweaks

Browse source
This commit is contained in:
Harvey Kandola 2016-11-27 15:59:08 -08:00
parent a83d6360e4
commit ddb93fae66
6 changed files with 643 additions and 642 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/app/pods/setup/template.hbs
View file

@ -1,4 +1,4 @@
<div class=" page-setup container-fluid padding-100 background-color-primary"> <div class="page-setup container-fluid padding-100">
<div class="row"> <div class="row">
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<div> <div>

10
app/app/templates/components/documize-setup.hbs
View file

@ -1,11 +1,9 @@
<div class="col-lg-9 col-md-9 col-sm-9"> <div class="col-lg-9 col-md-9 col-sm-9">
<div class="input-form"> <div class="form-bordered">
<form> <div class="form-header">
<div class="heading">
<div class="title">Let's setup Documize</div> <div class="title">Let's setup Documize</div>
<div class="tip">Database name is <em>{{model.dbname}}</em></div> <div class="tip">Database name is <em>{{model.dbname}}</em></div>
</div> </div>
<div>
<div class="input-control"> <div class="input-control">
<label>Team</label> <label>Team</label>
<div class="tip">What's your tribe called?</div> <div class="tip">What's your tribe called?</div>
@ -31,8 +29,6 @@
<div class="tip">Something you can remember without writing it down.</div> <div class="tip">Something you can remember without writing it down.</div>
{{input id="adminPassword" type="text" value=model.password class=(if hasEmptyPasswordError 'error')}} {{input id="adminPassword" type="text" value=model.password class=(if hasEmptyPasswordError 'error')}}
</div> </div>
<div class="regular-button button-green" {{ action 'save' }}>Go Setup</div> <div class="regular-button button-green" {{ action 'save' }}>Setup</div>
</div>
</form>
</div> </div>
</div> </div>

BIN
app/public/assets/img/setup/logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Before After
Before After

2
core/database/check.go
View file

@ -118,7 +118,7 @@ func Check(Db *sqlx.DB, connectionString string) bool {
return false return false
} }
if strings.TrimSpace(flds[0]) == "0" { if strings.TrimSpace(flds[0]) == "0" {
log.Error("Entering database set-up mode because the database is empty.", errors.New("no tables")) log.Info("Entering database set-up mode because the database is empty.....")
web.SiteMode = web.SiteModeSetup web.SiteMode = web.SiteModeSetup
return false return false
} }

5
core/database/create.go
View file

@ -87,6 +87,11 @@ func Create(w http.ResponseWriter, r *http.Request) {
dbname := r.Form.Get("dbname") dbname := r.Form.Get("dbname")
dbhash := r.Form.Get("dbhash") dbhash := r.Form.Get("dbhash")
fmt.Println(dbname)
fmt.Println(dbhash)
fmt.Println(web.SiteInfo.DBname)
fmt.Println(web.SiteInfo.DBhash)
if dbname != web.SiteInfo.DBname || dbhash != web.SiteInfo.DBhash { if dbname != web.SiteInfo.DBname || dbhash != web.SiteInfo.DBhash {
log.Error("database.Create()'s security credentials error ", errors.New("bad db name or validation code")) log.Error("database.Create()'s security credentials error ", errors.New("bad db name or validation code"))
return return

1208
embed/bindata_assetfs.go
View file

File diff suppressed because one or more lines are too long