Browse Source

Mobile layout fixes

Vova Tkach 5 years ago
parent
commit
a5865e04d1
4 changed files with 5 additions and 22 deletions
  1. 1 1
      engine/builder/data_form.go
  2. 1 10
      modules/module_settings.go
  3. 0 2
      modules/module_shop.go
  4. 3 9
      modules/module_template.go

+ 1 - 1
engine/builder/data_form.go

@@ -141,7 +141,7 @@ func DataForm(wrap *wrapper.Wrapper, data []DataFormField) string {
 				html_button += ` `
 				html_button += ` `
 				html_button += `</div>`
 				html_button += `</div>`
 				html_button += `<div class="col-md-9">`
 				html_button += `<div class="col-md-9">`
-				html_button += `<button type="submit" class="btn btn-primary" data-target="` + field.Target + `">` + html.EscapeString(field.Value) + `</button>`
+				html_button += `<div class="pt-3"><button type="submit" class="btn btn-primary" data-target="` + field.Target + `">` + html.EscapeString(field.Value) + `</button></div>`
 				html_button += `</div>`
 				html_button += `</div>`
 				html_button += `</div>`
 				html_button += `</div>`
 			}
 			}

+ 1 - 10
modules/module_settings.go

@@ -48,16 +48,10 @@ func (this *Modules) RegisterModule_Settings() *Module {
 						return `<div class="form-group last"><div class="row"><div class="col-12"><textarea class="form-control autosize" id="lbl_content" name="content" placeholder="" autocomplete="off">` + html.EscapeString(string(fcont)) + `</textarea></div></div></div>`
 						return `<div class="form-group last"><div class="row"><div class="col-12"><textarea class="form-control autosize" id="lbl_content" name="content" placeholder="" autocomplete="off">` + html.EscapeString(string(fcont)) + `</textarea></div></div></div>`
 					},
 					},
 				},
 				},
-				{
-					Kind: builder.DFKMessage,
-					CallBack: func(field *builder.DataFormField) string {
-						return `<div class="row"><div class="col-12"><div class="sys-messages"></div></div></div>`
-					},
-				},
 				{
 				{
 					Kind: builder.DFKSubmit,
 					Kind: builder.DFKSubmit,
 					CallBack: func(field *builder.DataFormField) string {
 					CallBack: func(field *builder.DataFormField) string {
-						return `<div class="row d-lg-none"><div class="col-12"><button type="submit" class="btn btn-primary" data-target="add-edit-button">Save</button></div></div>`
+						return `<div class="row d-lg-none"><div class="col-12"><div class="pt-3"><button type="submit" class="btn btn-primary" data-target="add-edit-button">Save</button></div></div></div>`
 					},
 					},
 				},
 				},
 			})
 			})
@@ -119,9 +113,6 @@ func (this *Modules) RegisterModule_Settings() *Module {
 					Required: true,
 					Required: true,
 					Value:    utils.IntToStr((*wrap.Config).Shop.Pagination.Category),
 					Value:    utils.IntToStr((*wrap.Config).Shop.Pagination.Category),
 				},
 				},
-				{
-					Kind: builder.DFKMessage,
-				},
 				{
 				{
 					Kind:   builder.DFKSubmit,
 					Kind:   builder.DFKSubmit,
 					Value:  "Save",
 					Value:  "Save",

+ 0 - 2
modules/module_shop.go

@@ -829,7 +829,6 @@ func (this *Modules) RegisterModule_Shop() *Module {
 							`<button type="button" class="btn btn-success" style="position:absolute;top:0px;right:0px;" onclick="fave.ShopProductsAdd();">Add attribute</button>` +
 							`<button type="button" class="btn btn-success" style="position:absolute;top:0px;right:0px;" onclick="fave.ShopProductsAdd();">Add attribute</button>` +
 							`</div>` +
 							`</div>` +
 							`</div>` +
 							`</div>` +
-							`<div class="d-lg-none" style="height:1rem;"></div>` +
 							`</div>` +
 							`</div>` +
 							`</div>` +
 							`</div>` +
 							`</div>`
 							`</div>`
@@ -1095,7 +1094,6 @@ func (this *Modules) RegisterModule_Shop() *Module {
 							`</div>` +
 							`</div>` +
 							`<div class="list-button"><button type="button" class="btn btn-success" onclick="fave.ShopAttributesAdd();">Add attribute value</button></div>` +
 							`<div class="list-button"><button type="button" class="btn btn-success" onclick="fave.ShopAttributesAdd();">Add attribute value</button></div>` +
 							`</div>` +
 							`</div>` +
-							`<div class="d-lg-none" style="height:1rem;"></div>` +
 							`</div>` +
 							`</div>` +
 							`</div>` +
 							`</div>` +
 							`</div>`
 							`</div>`

+ 3 - 9
modules/module_template.go

@@ -89,14 +89,14 @@ func (this *Modules) RegisterModule_Template() *Module {
 						CallBack: func(field *builder.DataFormField) string {
 						CallBack: func(field *builder.DataFormField) string {
 							return `<div class="form-group n1">` +
 							return `<div class="form-group n1">` +
 								`<div class="row">` +
 								`<div class="row">` +
-								`<div class="col-9">` +
+								`<div class="col-7">` +
 								`<div>` +
 								`<div>` +
 								`<select class="form-control ignore-lost-data" id="lbl_file" name="file" onchange="setTimeout(function(){$('#lbl_file').val('` + selected_file + `')},500);document.location='/cp/` + wrap.CurrModule + `/?file='+encodeURI(this.value);">` +
 								`<select class="form-control ignore-lost-data" id="lbl_file" name="file" onchange="setTimeout(function(){$('#lbl_file').val('` + selected_file + `')},500);document.location='/cp/` + wrap.CurrModule + `/?file='+encodeURI(this.value);">` +
 								list_of_files +
 								list_of_files +
 								`</select>` +
 								`</select>` +
 								`</div>` +
 								`</div>` +
 								`</div>` +
 								`</div>` +
-								`<div class="col-3">` +
+								`<div class="col-5">` +
 								`<button type="button" class="btn btn-danger" onclick="return fave.ActionRestoreThemeFile('template-restore-file','` + selected_file + `','Are you sure want to restore theme file?');">Restore</button>` +
 								`<button type="button" class="btn btn-danger" onclick="return fave.ActionRestoreThemeFile('template-restore-file','` + selected_file + `','Are you sure want to restore theme file?');">Restore</button>` +
 								`</div>` +
 								`</div>` +
 								`</div>` +
 								`</div>` +
@@ -109,16 +109,10 @@ func (this *Modules) RegisterModule_Template() *Module {
 							return `<div class="form-group last"><div class="row"><div class="col-12"><textarea class="form-control tmpl-editor" id="lbl_content" name="content" data-emode="` + fext + `" placeholder="" autocomplete="off">` + html.EscapeString(string(fcont)) + `</textarea></div></div></div>`
 							return `<div class="form-group last"><div class="row"><div class="col-12"><textarea class="form-control tmpl-editor" id="lbl_content" name="content" data-emode="` + fext + `" placeholder="" autocomplete="off">` + html.EscapeString(string(fcont)) + `</textarea></div></div></div>`
 						},
 						},
 					},
 					},
-					{
-						Kind: builder.DFKMessage,
-						CallBack: func(field *builder.DataFormField) string {
-							return `<div class="row"><div class="col-12"><div class="sys-messages"></div></div></div>`
-						},
-					},
 					{
 					{
 						Kind: builder.DFKSubmit,
 						Kind: builder.DFKSubmit,
 						CallBack: func(field *builder.DataFormField) string {
 						CallBack: func(field *builder.DataFormField) string {
-							return `<div class="row d-lg-none"><div class="col-12"><button type="submit" class="btn btn-primary" data-target="add-edit-button">Save</button></div></div>`
+							return `<div class="row d-lg-none"><div class="col-12"><div class="pt-3"><button type="submit" class="btn btn-primary" data-target="add-edit-button">Save</button></div></div></div>`
 						},
 						},
 					},
 					},
 				})
 				})