[ticket/571] Some more minor fixes

B3P-571
This commit is contained in:
Marc Alexander
2015-06-06 15:29:37 +02:00
parent 9d4515432c
commit 45fb1c859d
4 changed files with 43 additions and 43 deletions

View File

@@ -149,47 +149,47 @@
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>{L_ACP_PORTAL_EVENTS}</legend> <legend>{L_ACP_PORTAL_EVENTS}</legend>
<fieldset class="tabulated"> <fieldset class="tabulated">
<p class="quick"> <p class="quick">
<input class="button2" name="add" type="submit" value="{L_ADD_EVENT}" /> <input class="button2" name="add" type="submit" value="{L_ADD_EVENT}" />
</p> </p>
<table cellspacing="1"> <table cellspacing="1">
<thead> <thead>
<tr> <tr>
<th>{L_EVENT_TITLE}</th> <th>{L_EVENT_TITLE}</th>
<th>{L_EVENT_DESC}</th> <th>{L_EVENT_DESC}</th>
<th>{L_EVENT_TIME}</th> <th>{L_EVENT_TIME}</th>
<th>{L_EVENT_LINK}</th> <th>{L_EVENT_LINK}</th>
<th>{L_ACTION}</th> <th>{L_ACTION}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<!-- BEGIN events --> <!-- BEGIN events -->
<!-- IF events.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <!-- IF events.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td style="text-align: center;">{events.EVENT_TITLE}</td> <td style="text-align: center;">{events.EVENT_TITLE}</td>
<td style="text-align: center;">{events.EVENT_DESC}</td> <td style="text-align: center;">{events.EVENT_DESC}</td>
<td style="text-align: center;"><!-- IF events.EVENT_END -->{L_EVENT_START}{L_COLON}&nbsp;{events.EVENT_START}&nbsp;&#124;&nbsp;{L_EVENT_END}{L_COLON}&nbsp;{events.EVENT_END}<!-- ELSE -->{L_EVENT_TIME}{L_COLON}&nbsp;{events.EVENT_START}<!-- IF events.EVENT_ALL_DAY -->&nbsp;&#124;&nbsp;{L_EVENT_ALL_DAY}<!-- ENDIF --><!-- ENDIF --></td> <td style="text-align: center;"><!-- IF events.EVENT_END -->{L_EVENT_START}{L_COLON}&nbsp;{events.EVENT_START}&nbsp;&#124;&nbsp;{L_EVENT_END}{L_COLON}&nbsp;{events.EVENT_END}<!-- ELSE -->{L_EVENT_TIME}{L_COLON}&nbsp;{events.EVENT_START}<!-- IF events.EVENT_ALL_DAY -->&nbsp;&#124;&nbsp;{L_EVENT_ALL_DAY}<!-- ENDIF --><!-- ENDIF --></td>
<td style="text-align: center;"><a href="{events.EVENT_URL}" alt="{events.EVENT_TITLE}">{events.EVENT_URL_RAW}</td> <td style="text-align: center;"><a href="{events.EVENT_URL}" alt="{events.EVENT_TITLE}">{events.EVENT_URL_RAW}</td>
<td style="text-align: center;"> <td style="text-align: center;">
<a href="{events.U_EDIT}">{ICON_EDIT}</a> <a href="{events.U_DELETE}">{ICON_DELETE}</a> <a href="{events.U_EDIT}">{ICON_EDIT}</a> <a href="{events.U_DELETE}">{ICON_DELETE}</a>
</td> </td>
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr class="row1"> <tr class="row1">
<td style="text-align: center;" colspan="5">{L_NO_EVENTS}</td> <td style="text-align: center;" colspan="5">{L_NO_EVENTS}</td>
</tr> </tr>
<!-- END events --> <!-- END events -->
</tbody> </tbody>
</table> </table>
<p class="submit-buttons"> <p class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp; <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
</p> </p>
{S_FORM_TOKEN} {S_FORM_TOKEN}
</fieldset> </fieldset>
</fieldset> </fieldset>
</form> </form>

View File

@@ -64,7 +64,7 @@
</form> </form>
<!-- ELSE --> <!-- ELSE -->
<form id="acp_portal_links" method="post" action="{U_ACTION}"> <form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
<!-- IF SHOW_MODULE_OPTIONS --> <!-- IF SHOW_MODULE_OPTIONS -->
<fieldset> <fieldset>
<legend>{L_MODULE_OPTIONS}</legend> <legend>{L_MODULE_OPTIONS}</legend>
@@ -139,7 +139,7 @@
<input class="button2" name="add" type="submit" value="{L_ACP_PORTAL_LINK_ADD}" /> <input class="button2" name="add" type="submit" value="{L_ACP_PORTAL_LINK_ADD}" />
</p> </p>
<table cellspacing="1"> <table style="cellspacing: 1;">
<thead> <thead>
<tr> <tr>
<th>{L_ACP_PORTAL_LINK_TITLE}</th> <th>{L_ACP_PORTAL_LINK_TITLE}</th>

View File

@@ -249,7 +249,7 @@ class links extends module_base
$links = $this->utf_unserialize($portal_config['board3_links_array_' . $module_id]); $links = $this->utf_unserialize($portal_config['board3_links_array_' . $module_id]);
$u_action = append_sid('index.' . $this->php_ext, 'i=\board3\portal\acp\portal_module&amp;mode=config&amp;module_id=' . $module_id); $u_action = append_sid('index.' . $this->php_ext, 'i=-board3-portal-acp-portal_module&amp;mode=config&amp;module_id=' . $module_id);
switch ($action) switch ($action)
{ {

View File

@@ -393,6 +393,6 @@ class manager
*/ */
public function get_module_link($mode, $module_id) public function get_module_link($mode, $module_id)
{ {
return preg_replace(array('/i=[0-9]+/', '/mode=[a-zA-Z0-9_]+/'), array('i=%5C' . str_replace('\\', '%5C', $this->acp_class), 'mode=' . $mode), $this->u_action) . (($module_id) ? '&amp;module_id=' . $module_id : ''); return preg_replace(array('/i=[0-9]+/', '/mode=[a-zA-Z0-9_]+/'), array('i=%5C' . str_replace('\\', '-', $this->acp_class), 'mode=' . $mode), $this->u_action) . (($module_id) ? '&amp;module_id=' . $module_id : '');
} }
} }