more bs5 fixes

6 files changed, 10 insertions, 24 deletions

diff --git a/view/tpl/cdav_widget_calendar.tpl b/view/tpl/cdav_widget_calendar.tpl
index 878221bf1..c27f4789e 100644
--- a/view/tpl/cdav_widget_calendar.tpl
+++ b/view/tpl/cdav_widget_calendar.tpl
@@ -62,9 +62,7 @@
 					<label for="edit-form-{{$calendar.calendarid}}">{{$edit_label}}</label>
 					<div id="edit-form-{{$calendar.calendarid}}" class="input-group mb-3">
 						<input id="create-{{$calendar.calendarid}}" name="{DAV:}displayname" type="text" value="{{$calendar.displayname}}" class="form-control">
-						<div class="input-group-append">
-							<div class="input-group-addon p-3"></div>
-						</div>
+						<div class="input-group-addon p-3"></div>
 					</div>
 					<div class="mb-3">
 						<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
@@ -104,9 +102,7 @@
 					<input id="color" name="color" type="hidden" value="#ff8f00" class="color-edit-input">
 					<div id="create-form" class="input-group mb-3">
 						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control">
-						<div class="input-group-append">
-							<div class="input-group-addon p-3"></div>
-						</div>
+						<div class="input-group-addon p-3"></div>
 					</div>
 					<div class="mb-3">
 						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index 86f353d82..f6ee1b1db 100644
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -19,9 +19,7 @@
 		<form action="{{$cmd}}" method="get" id="mimimi" name="contacts-search-form">
 			<div class="input-group mb-3">
 				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
-				<div class="input-group-append">
-					<button id="contacts-search-submit" class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
-				</div>
+				<button id="contacts-search-submit" class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
 			</div>
 		</form>
 	</div>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index da472fa9b..53325fdce 100644
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -3,9 +3,7 @@
 	<form action="follow" method="post" />
 		<div class="input-group">
 			<input class="form-control" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
-			<div class="input-group-append">
-				<button class="btn btn-sm btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
-			</div>
+			<button class="btn btn-sm btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
 		</div>
 	</form>
 	{{if $abook_usage_message}}
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index cb0617b10..2ede221f3 100644
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -3,9 +3,7 @@
 	<form action="directory" method="post" />
 		<div class="input-group mb-3">
 			<input class="form-control" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
-			<div class="input-group-append">
-				<button class="btn btn-sm btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
-			</div>
+			<button class="btn btn-sm btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
 		</div>
 	</form>
 	<ul class="nav nav-pills flex-column">
diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl
index 0ff526847..ec855dc5c 100644
--- a/view/tpl/searchbox.tpl
+++ b/view/tpl/searchbox.tpl
@@ -2,11 +2,9 @@
 	<input type="hidden" name="f" value="" />
 	<div id="{{$id}}" class="input-group">
 		<input class="form-control" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
-		<div class="input-group-append">
-			<button type="submit" name="submit" class="btn btn-sm btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
-			{{if $savedsearch}}
-			<button type="submit" name="searchsave" class="btn btn-sm btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button>
-			{{/if}}
-		</div>
+		<button type="submit" name="submit" class="btn btn-sm btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
+		{{if $savedsearch}}
+		<button type="submit" name="searchsave" class="btn btn-sm btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button>
+		{{/if}}
 	</div>
 </form>
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index c300bddba..33d4dd097 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -67,9 +67,7 @@
 			<div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none">
 				<div class="input-group">
 					<input class="form-control" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
-					<div class="input-group-append">
-						<button id="save-page" type="button" class="btn btn-sm btn-primary disabled">Save</button>
-					</div>
+					<button id="save-page" type="button" class="btn btn-sm btn-primary disabled">Save</button>
 				</div>
 			</div>
 			{{/if}}