Skip to content

Commit b77a94f

Browse files
benkeenbenkeen
committed
Minor fixes for add form process
1 parent 5d25d20 commit b77a94f

3 files changed

Lines changed: 96 additions & 97 deletions

File tree

‎src/admin/forms/add/step5.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
Core::init();
1515
Core::$user->checkAuth("admin");
1616

17-
1817
$sortable_id = "review_field_options";
1918
$form_id = General::loadField("form_id", "add_form_form_id", "");
2019
$form_info = Forms::getForm($form_id);

‎src/themes/default/admin/forms/add/step1.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<table width="100%">
3333
<tr>
3434
<td width="49%" valign="top">
35-
<div id="direct_box" class="{if $form_info.submission_type == "direct"}blue_box{else}grey_box{/if}">
35+
<div id="direct_box" class="{if array_key_exists("submission_type", $form_info) && $form_info.submission_type == "direct"}blue_box{else}grey_box{/if}">
3636
<span style="float:right"><input type="submit" class="blue bold" value="{$LANG.word_select|upper}" name="direct" /></span>
3737
<div class="bold">{$LANG.phrase_1_direct}</div>
3838
<div class="medium_grey">&#8212; {$LANG.text_add_form_step_3_text_2}</div>
@@ -46,7 +46,7 @@
4646
{if $has_api}
4747
<td width="2%"> </td>
4848
<td width="49%" valign="top">
49-
<div id="select_box" class="{if $form_info.submission_type == "code"}blue_box{else}grey_box{/if}">
49+
<div id="select_box" class="{if array_key_exists("submission_type", $form_info) && $form_info.submission_type == "code"}blue_box{else}grey_box{/if}">
5050
<span style="float:right"><input type="submit" class="blue bold" value="{$LANG.word_select|upper}" name="code" /></span>
5151
<div class="bold">{$LANG.phrase_2_code}</div>
5252
<div class="medium_grey">&#8212; {$LANG.text_add_form_step_3_text_3}</div>

‎src/themes/default/admin/forms/add/step5.tpl‎

Lines changed: 94 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,36 @@
1111
</tr>
1212
</table>
1313

14-
<table cellpadding="0" cellspacing="0" width="100%" class="add_form_nav">
15-
<tr>
16-
<td class="selected"><a href="step1.php">{$LANG.word_start}</a></td>
17-
<td class="selected"><a href="step2.php">{$LANG.phrase_form_info}</a></td>
18-
<td class="selected"><a href="step3.php">{$LANG.phrase_test_submission}</a></td>
19-
<td class="selected"><a href="step4.php">{$LANG.phrase_database_setup}</a></td>
20-
<td class="selected">{$LANG.phrase_field_types}</td>
21-
<td class="unselected">{$LANG.phrase_finalize_form}</td>
22-
</tr>
23-
</table>
24-
25-
<br />
26-
27-
<div class="subtitle underline margin_bottom_large">
28-
5. {$LANG.phrase_field_types|upper}
14+
<table cellpadding="0" cellspacing="0" width="100%" class="add_form_nav">
15+
<tr>
16+
<td class="selected"><a href="step1.php">{$LANG.word_start}</a></td>
17+
<td class="selected"><a href="step2.php">{$LANG.phrase_form_info}</a></td>
18+
<td class="selected"><a href="step3.php">{$LANG.phrase_test_submission}</a></td>
19+
<td class="selected"><a href="step4.php">{$LANG.phrase_database_setup}</a></td>
20+
<td class="selected">{$LANG.phrase_field_types}</td>
21+
<td class="unselected">{$LANG.phrase_finalize_form}</td>
22+
</tr>
23+
</table>
24+
25+
<br />
26+
27+
<div class="subtitle underline margin_bottom_large">
28+
5. {$LANG.phrase_field_types|upper}
2929
</div>
3030

3131
<div>
32-
<span style="float: right">
33-
<table cellspacing="0" cellpadding="0" style="height:40px">
34-
<tr>
35-
<td class="pad_left" align="center">
36-
<input type="button" id="smart_fill_button" value="{$LANG.phrase_smart_fill}" class="light_grey bold"
37-
onclick="sf_ns.smart_fill()" disabled /><br />
38-
</td>
39-
<td width="40" align="right">
40-
<div id="ajax_activity"><img src="{$images_url}/ajax_activity.gif" /></div>
41-
<div id="ajax_no_activity" style="display:none"><img src="{$images_url}/ajax_no_activity.gif" /></div>
42-
</td>
43-
</tr>
32+
<span style="float: right">
33+
<table cellspacing="0" cellpadding="0" style="height:40px">
34+
<tr>
35+
<td class="pad_left" align="center">
36+
<input type="button" id="smart_fill_button" value="{$LANG.phrase_smart_fill}" class="light_grey bold"
37+
onclick="sf_ns.smart_fill()" disabled /><br />
38+
</td>
39+
<td width="40" align="right">
40+
<div id="ajax_activity"><img src="{$images_url}/ajax_activity.gif" /></div>
41+
<div id="ajax_no_activity" style="display:none"><img src="{$images_url}/ajax_no_activity.gif" /></div>
42+
</td>
43+
</tr>
4444
</table>
4545
</span>
4646
<p>
@@ -53,42 +53,42 @@
5353

5454
{ft_include file="messages.tpl"}
5555

56-
<form action="{$same_page}" method="post">
57-
<input type="hidden" name="form_id" value="{$form_id}" />
56+
<form action="{$same_page}" method="post">
57+
<input type="hidden" name="form_id" value="{$form_id}" />
5858

5959
<div id="main_field_table">
60-
61-
<table class="list_table" width="100%" cellpadding="0" cellspacing="1">
62-
<tr>
63-
<th>{$LANG.phrase_display_name}</th>
60+
61+
<table class="list_table" width="100%" cellpadding="0" cellspacing="1">
62+
<tr>
63+
<th>{$LANG.phrase_display_name}</th>
6464
<th>{$LANG.phrase_field_type}</th>
65-
<th>{$LANG.phrase_field_size}</th>
65+
<th>{$LANG.phrase_field_size}</th>
6666
<th class="nowrap">{$LANG.phrase_action_needed}</th>
67-
<th width="100" class="nowrap">{$LANG.word_options|upper}</th>
68-
</tr>
69-
70-
{foreach from=$form_fields item=field name=row}
71-
{assign var=row_count value=$smarty.foreach.row.iteration}
72-
{assign var=field_id value=$field.field_id}
73-
74-
{if $field.is_system_field == "no"}
75-
<tr style="{$style}">
76-
<td class="blue pad_left_small" width="180" id="field_{$field_id}_title">{$field.field_title}</td>
67+
<th width="100" class="nowrap">{$LANG.word_options|upper}</th>
68+
</tr>
69+
70+
{foreach from=$form_fields item=field name=row}
71+
{assign var=row_count value=$smarty.foreach.row.iteration}
72+
{assign var=field_id value=$field.field_id}
73+
74+
{if $field.is_system_field == "no"}
75+
<tr>
76+
<td class="blue pad_left_small" width="180" id="field_{$field_id}_title">{$field.field_title}</td>
7777
<td class="pad_left_small">
78-
{* why are we passing this as a hidden field? Is it really necessary? Kind of bloats the POST request... *}
78+
{* why are we passing this as a hidden field? Is it really necessary? Kind of bloats the POST request... *}
7979
<input type="hidden" id="field_{$field_id}_name" value="{$field.field_name}" />
80-
<div id="field_{$field_id}_type_div" class="light_grey">{$LANG.word_unknown}</div>
80+
<div id="field_{$field_id}_type_div" class="light_grey">{$LANG.word_unknown}</div>
8181
</td>
8282
<td>
8383
<div id="field_{$field_id}_size_div" class="light_grey">{$LANG.word_unknown}</div>
84-
</td>
84+
</td>
8585
<td align="center" class="pad_left_small"><span id="field_{$field_id}_action" class="light_grey">&#8212;</span></td>
86-
<td align="center"><span id="field_{$field_id}_options" class="light_grey">&#8212;</span></td>
87-
</tr>
88-
{/if}
89-
{/foreach}
90-
</table>
91-
86+
<td align="center"><span id="field_{$field_id}_options" class="light_grey">&#8212;</span></td>
87+
</tr>
88+
{/if}
89+
{/foreach}
90+
</table>
91+
9292
<table cellspacing="0" cellpadding="0" width="100%" class="margin_top_large">
9393
<tr>
9494
<td width="150" valign="top"><input type="button" id="refresh_page_button" value="{$LANG.phrase_refresh_page}" onclick="sf_ns.refresh_page()" /></td>
@@ -161,7 +161,7 @@
161161
</div>
162162
<div class="clear"></div>
163163

164-
<p>
164+
<p>
165165
<span style="float:right"><input type="button" value="{$LANG.phrase_update_field}"
166166
onclick="sf_ns.update_field('review_field_options_action_needed')" /></span>
167167
<input type="button" value="{$LANG.phrase_add_row}" onclick="sf_ns.add_field_option()" />
@@ -172,15 +172,15 @@
172172
</td>
173173
</tr>
174174
</table>
175-
176-
<div class="margin_bottom_large pad_left_small pad_right_small" style="background-color: #efefef; border-top: 2px solid #cccccc; border-bottom: 2px solid #cccccc;">
177-
<span style="float:right">
178-
<span class="previous_field_link" id="review_field_options_previous_field_link2"></span> |
179-
<span class="next_field_link" id="review_field_options_next_field_link2"></span>
180-
</span>
181-
<a href="#" onclick="return sf_ns.show_page('main_field_table', null)">{$LANG.phrase_back_to_field_list}</a>
182-
</div>
183-
175+
176+
<div class="margin_bottom_large pad_left_small pad_right_small" style="background-color: #efefef; border-top: 2px solid #cccccc; border-bottom: 2px solid #cccccc;">
177+
<span style="float:right">
178+
<span class="previous_field_link" id="review_field_options_previous_field_link2"></span> |
179+
<span class="next_field_link" id="review_field_options_next_field_link2"></span>
180+
</span>
181+
<a href="#" onclick="return sf_ns.show_page('main_field_table', null)">{$LANG.phrase_back_to_field_list}</a>
182+
</div>
183+
184184
</div>
185185

186186

@@ -278,7 +278,7 @@
278278
</div>
279279
</div>
280280

281-
</form>
281+
</form>
282282

283283
{foreach from=$form_urls item=url name="row"}
284284
{assign var=row_count value=$smarty.foreach.row.iteration}
@@ -311,33 +311,33 @@
311311
</ol>
312312
{$text_add_form_field_types_multiple_fields_found8}
313313
</div>
314-
315-
<div id="upload_files_text" style="display:none">
316-
{$LANG.text_add_form_field_types_manual_upload}
317-
318-
<form action="{$g_root_url}/global/code/actions.php?action=upload_scraped_pages_for_smart_fill"
319-
target="upload_files_iframe" method="post" enctype="multipart/form-data"
320-
onsubmit="return sf_ns.validate_upload_files(this)">
321-
<input type="hidden" name="num_pages" value="{$form_urls|@count}" />
322-
323-
<table cellspacing="0" cellpadding="0" class="margin_top margin_bottom">
324-
{foreach from=$form_urls item=url name="row"}
325-
{assign var=row_count value=$smarty.foreach.row.iteration}
326-
<tr>
327-
<td width="90">{$LANG.phrase_form_page} {$row_count}</td>
328-
<td><input type="file" name="form_page_{$row_count}" /></td>
329-
</tr>
330-
{/foreach}
331-
<tr>
332-
<td> </td>
333-
<td><input type="submit" value="{$LANG.phrase_upload_files}" class="margin_top_small" /></td>
334-
</tr>
335-
</table>
336-
</form>
337-
{$LANG.text_add_form_field_types_manual_upload2}
338-
</div>
339-
340-
<iframe name="upload_files_iframe" id="upload_files_iframe" src="" style="width: 0px; height: 0px" frameborder="0"
341-
onload="sf_ns.log_files_as_uploaded()"></iframe>
342-
343-
{ft_include file='footer.tpl'}
314+
315+
<div id="upload_files_text" style="display:none">
316+
{$LANG.text_add_form_field_types_manual_upload}
317+
318+
<form action="{$g_root_url}/global/code/actions.php?action=upload_scraped_pages_for_smart_fill"
319+
target="upload_files_iframe" method="post" enctype="multipart/form-data"
320+
onsubmit="return sf_ns.validate_upload_files(this)">
321+
<input type="hidden" name="num_pages" value="{$form_urls|@count}" />
322+
323+
<table cellspacing="0" cellpadding="0" class="margin_top margin_bottom">
324+
{foreach from=$form_urls item=url name="row"}
325+
{assign var=row_count value=$smarty.foreach.row.iteration}
326+
<tr>
327+
<td width="90">{$LANG.phrase_form_page} {$row_count}</td>
328+
<td><input type="file" name="form_page_{$row_count}" /></td>
329+
</tr>
330+
{/foreach}
331+
<tr>
332+
<td> </td>
333+
<td><input type="submit" value="{$LANG.phrase_upload_files}" class="margin_top_small" /></td>
334+
</tr>
335+
</table>
336+
</form>
337+
{$LANG.text_add_form_field_types_manual_upload2}
338+
</div>
339+
340+
<iframe name="upload_files_iframe" id="upload_files_iframe" src="" style="width: 0px; height: 0px" frameborder="0"
341+
onload="sf_ns.log_files_as_uploaded()"></iframe>
342+
343+
{ft_include file='footer.tpl'}

0 commit comments

Comments
 (0)