From 9b4da018f0d154d3b061d7131fed8d327e3cd145 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Wed, 6 Jul 2016 08:42:36 +0200
Subject: [PATCH] fix template to be 16.1-nish: move add button from extra row
 to left using egw.open_link instead of window.open

---
 .../templates/default/definition_index.xet    | 78 +++++++------------
 1 file changed, 29 insertions(+), 49 deletions(-)

diff --git a/importexport/templates/default/definition_index.xet b/importexport/templates/default/definition_index.xet
index 65d6390015..6c63ae76de 100644
--- a/importexport/templates/default/definition_index.xet
+++ b/importexport/templates/default/definition_index.xet
@@ -5,13 +5,12 @@
 	<template id="importexport.definition_index.row" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%">
 			<columns>
-				<column width="20px"/>
+				<column width="50px"/>
 				<column/>
 				<column width="150px"/>
 				<column width="150px"/>
 				<column width="150px"/>
 				<column width="10px"/>
-				<column width="10px" disabled="@no_actions"/>
 			</columns>
 			<rows>
 				<row class="th">
@@ -40,54 +39,35 @@
 }
 		</styles>
 	</template>
+	<template id="importexport.definition_index.add" template="" lang="" group="0" version="1.9.002">
+		<buttononly statustext="Add a new definition" label="Add" id="add" onclick="egw(window).open_link('importexport.importexport_definitions_ui.edit','_blank','500x500'); return false;"/>
+	</template>
 	<template id="importexport.definition_index" template="" lang="" group="0" version="1.9.002">
-		<grid width="100%">
-			<columns>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<buttononly align="right" statustext="Add a new definition" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=importexport.importexport_definitions_ui.edit'),'_blank','dependent=yes,width=500,height=500,status=yes'); return false;"/>
-				</row>
-				<row>
-					<nextmatch id="nm" template="importexport.definition_index.row"/>
-				</row>
-				<row disabled="!@nm[selectcols]=/actions/">
-					<hbox align="right">
-						<buttononly statustext="Select action" label="Select action" id="legacy_actions" onclick="if (!egw_globalObjectManager.getObjectById('importexport.definition_index.row').executeActionImplementation(this, 'popup')) alert(egw::lang('You need to select some entries first!')); return false;;"/>
-						<button statustext="Check all" label="Check all" id="check_all" needed="1" onclick="egw_globalObjectManager.getObjectById('importexport.definition_index.row').toggleAllSelected(); return false;" image="arrow_ltr" class="checkAllArrow"/>
-					</hbox>
-				</row>
-				<row>
-					<box>
-						<box id="owner_popup" class="action_popup prompt">
-							<description value="Change owner" class="promptheader"/>
-							<vbox class="action_popup-content">
-								<description value="Select owner"/>
-								<listbox type="select-account" id="owner" options="None,accounts"/>
-								<hbox>
-									<button id="save_owner" label="Save" onclick="nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'owner_popup');"/>
-								</hbox>
-							</vbox>
-						</box>
-						<box id="allowed_popup" class="action_popup prompt">
-							<vbox>
-								<description value="Change allowed users" class="promptheader"/>
-								<description value="Select groups"/>
-								<checkbox label="%s Just me" id="allowed_private"/>
-								<checkbox label="%s All users" id="all_users"/>
-								<listbox type="select-account" id="allowed" rows="5" account_type="groups"/>
-								<hbox>
-									<button id="save_allowed" label="Save" onclick="nm_submit_popup(this); return false;" image="save" background_image="1"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'allowed_popup');" image="cancel" background_image="1"/>
-								</hbox>
-							</vbox>
-						</box>
-					</box>
-				</row>
-			</rows>
-		</grid>
+		<nextmatch id="nm" template="importexport.definition_index.row" header_left="importexport.definition_index.add"/>
+		<box id="owner_popup" class="action_popup prompt">
+			<description value="Change owner" class="promptheader"/>
+			<vbox class="action_popup-content">
+				<description value="Select owner"/>
+				<listbox type="select-account" id="owner" options="None,accounts"/>
+				<hbox>
+					<button id="save_owner" label="Save" onclick="nm_submit_popup(this); return false;"/>
+					<buttononly label="Cancel" onclick="nm_hide_popup(this,'owner_popup');"/>
+				</hbox>
+			</vbox>
+		</box>
+		<box id="allowed_popup" class="action_popup prompt">
+			<vbox>
+				<description value="Change allowed users" class="promptheader"/>
+				<description value="Select groups"/>
+				<checkbox label="%s Just me" id="allowed_private"/>
+				<checkbox label="%s All users" id="all_users"/>
+				<listbox type="select-account" id="allowed" rows="5" account_type="groups"/>
+				<hbox>
+					<button id="save_allowed" label="Save" onclick="nm_submit_popup(this); return false;" image="save" background_image="1"/>
+					<buttononly label="Cancel" onclick="nm_hide_popup(this,'allowed_popup');" image="cancel" background_image="1"/>
+				</hbox>
+			</vbox>
+		</box>
 		<styles>
 			td.lr_padding { padding-left: 5px; padding-right: 5px; }