mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

Admin-UI: Fix for $adminMenu attribute 'modal-caption' not functioning. Use 'modal'=>true to enable first.

Browse Source
This commit is contained in:
Cameron
2020-03-06 14:18:57 -08:00
parent 8129d919c4
commit 76dfad9311
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_tests/tests/unit/e_user_providerTest.php
View File

@@ -34,7 +34,7 @@ class e_user_providerTest extends \Codeception\Test\Unit
$this->assertIsArray($result); $this->assertIsArray($result);
$this->assertContains("Facebook", $result); $this->assertContains("Facebook", $result);
$this->assertContains("Twitter", $result); $this->assertContains("Twitter", $result);
$this->assertCount(42, $result, $this->assertCount(45, $result,
"The number of Hybridauth providers has changed! If this is intentional, note the change " . "The number of Hybridauth providers has changed! If this is intentional, note the change " .
"in Hybridauth providers in the release changelog and update the count in this test." "in Hybridauth providers in the release changelog and update the count in this test."
); );

15
e107_themes/bootstrap3/admin_template.php
View File

@@ -54,7 +54,7 @@ $E_ADMIN_NAVIGATION['button_enav_home'] = '
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" style="display:inline-block; margin-right:0;" title="'.ADLAN_53.'" href="'.e_HTTP.'" > <a class="dropdown-toggle" style="display:inline-block; margin-right:0;" title="'.ADLAN_53.'" href="'.e_HTTP.'" >
{LINK_IMAGE} {LINK_TEXT} {LINK_IMAGE} {LINK_TEXT}
</a><a style="display:inline-block;border-left:0;margin-left:0;padding-left:4px" class="dropdown-toggle" title="'.ADLAN_53.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" > </a><a style="display:inline-block;border-left:0;margin-left:0;padding-left:4px;" class="dropdown-toggle" title="'.ADLAN_53.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
<b class="caret"></b> <b class="caret"></b>
</a> </a>
{SUB_MENU} {SUB_MENU}
@@ -100,10 +100,10 @@ $E_ADMIN_NAVIGATION['button_enav_logout'] = '
$E_ADMIN_NAVIGATION['button_pm'] = ' $E_ADMIN_NAVIGATION['button_pm'] = '
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" > <a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
<i class="icon-envelope" class="active"></i> 3 <i class="icon-envelope active"></i> 3
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px"> <div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px;">
<ul class="nav-list"> <ul class="nav-list">
<li class="dropdown-header nav-header">Unread Messages</li> <li class="dropdown-header nav-header">Unread Messages</li>
<li><a href="#">Incoming Message Number 1</a></li> <li><a href="#">Incoming Message Number 1</a></li>
@@ -174,7 +174,7 @@ $ADMIN_MODAL = '
<p>'.LAN_LOADING.'</p> <p>'.LAN_LOADING.'</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" id="e-modal-submit" class="btn btn-success" style="display:none" data-loading-icon="fa-spinner"><!-- placeholder --></button> <button type="button" id="e-modal-submit" class="btn btn-success" style="display:none;" data-loading-icon="fa-spinner"><!-- placeholder --></button>
<button type="button" class="btn btn-primary" data-dismiss="modal">'.LAN_CLOSE.'</button> <button type="button" class="btn btn-primary" data-dismiss="modal">'.LAN_CLOSE.'</button>
</div> </div>
</div> </div>
@@ -289,19 +289,19 @@ $E_ADMIN_MENU['start'] = '
$E_ADMIN_MENU['button'] = ' $E_ADMIN_MENU['button'] = '
<li> <li>
<a class="link{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}>&nbsp;{LINK_TEXT}{LINK_BADGE}</a> <a class="link{LINK_CLASS}" {LINK_DATA} href="{LINK_URL}" {ID}{ONCLICK}>&nbsp;{LINK_TEXT}{LINK_BADGE}</a>
{SUB_MENU} {SUB_MENU}
</li> </li>
'; ';
$E_ADMIN_MENU['button_active'] = ' $E_ADMIN_MENU['button_active'] = '
<li class="active"> <li class="active">
<a class="link-active{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}>&nbsp;{LINK_TEXT}{LINK_BADGE}</a> <a class="link-active{LINK_CLASS}" {LINK_DATA} href="{LINK_URL}" {ID}{ONCLICK}>&nbsp;{LINK_TEXT}{LINK_BADGE}</a>
{SUB_MENU} {SUB_MENU}
</li> </li>
'; ';
$E_ADMIN_MENU['start_sub'] = ' $E_ADMIN_MENU['start_sub'] = '
<ul class="plugin-navigation-sub{SUB_CLASS}"{SUB_ID}> <ul class="plugin-navigation-sub{SUB_CLASS}" {SUB_ID}>
'; ';
$E_ADMIN_MENU['button_sub'] = ' $E_ADMIN_MENU['button_sub'] = '
@@ -329,4 +329,3 @@ $E_ADMIN_MENU['end'] = '
$E_ADMIN_MENU['divider'] = '<li role="separator" class="divider"></li>'; $E_ADMIN_MENU['divider'] = '<li role="separator" class="divider"></li>';
?>