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

Removed SEF Url config from Bootstrap5. Added missing prefs to default install. Moved popup tips during installation to their own icon. Adjusted acceptance test.

Browse Source
This commit is contained in:
Cameron
2022-04-07 07:15:30 -07:00
parent a9b3d830ac
commit 93b2926227
4 changed files with 39 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_core/xml/default_install.xml
View File

@@ -36,7 +36,7 @@
<core name="contact_info"><![CDATA[array (
)]]></core>
<core name="contact_emailcopy">0</core>
<core name="contact_visibility">0</core>
<core name="contact_visibility">253</core>
<core name="contact_filter"></core>
<core name="cookie_name">e107cookie</core>
<core name="core-infopanel-default"><![CDATA[array (
@@ -220,9 +220,13 @@
<core name="multilanguage">0</core>
<core name="nbr_cols">1</core>
<core name="nested_comments">1</core>
<core name="news_cats"></core>
<core name="news_default_template">default</core>
<core name="news_cats">0</core>
<core name="news_default_template">list</core>
<core name="news_editauthor">254</core>
<core name="news_list_limit">10</core>
<core name="news_list_templates"><![CDATA[array (
0 => '0',
)]]></core>
<core name="news_newdateheader">0</core>
<core name="news_pagination">record</core>
<core name="newsposts">10</core>
@@ -288,7 +292,7 @@
<core name="siteadmin">admin</core>
<core name="siteadminemail">user@yoursite.com</core>
<core name="sitebutton">{e_IMAGE}button.png</core>
<core name="sitecontacts">255</core>
<core name="sitecontacts">250</core>
<core name="sitedescription"></core>
<core name="sitedisclaimer"></core>
<core name="sitelang_init">English</core>

6
e107_tests/tests/acceptance/0000_InstallCest.php
View File

@@ -28,7 +28,7 @@ class InstallCest
$this->checkAdminButtonWelcomeMessage($I);
$this->testNoUpdatesRequired($I);
$this->checkTinyMceIsInstalled($I);
$this->checkBootstrap5Navigation($I);
// $this->checkBootstrap5Navigation($I);
}
/*
@@ -180,7 +180,7 @@ class InstallCest
$I->amOnPage('/e107_plugins/tinymce4/admin_config.php');
$I->see("Paste as text by default");
}
/*
private function checkBootstrap5Navigation(AcceptanceTester $I)
{
$I->amOnPage('/article-1');
@@ -191,7 +191,7 @@ class InstallCest
$I->amOnPage('/terms-of-use');
$I->see('Terms of Use','.breadcrumb-item');
}
}*/
private function checkAdminButtonWelcomeMessage(AcceptanceTester $I)

138
e107_themes/bootstrap5/install/install.xml
View File

@@ -16,69 +16,7 @@ USA',
'hours' => '',
'message' => '',
)]]></core>
<core name="contact_visibility">253</core>
<core name="news_cats">0</core>
<core name="news_default_template">list</core>
<core name="news_editauthor">255</core>
<core name="news_list_templates"><![CDATA[array (
0 => '0',
)]]></core>
<core name="passwordEncoding">3</core>
<core name="sitecontacts">250</core>
<core name="subnews_resize">0</core>
<core name="upload_maxfilesize">2G</core>
<core name="url_config"><![CDATA[array (
'gallery' => 'plugin/rewrite',
'index' => 'core',
'news' => 'core/sef_noid',
'page' => 'core/sef_noid',
'search' => 'core/rewrite',
'system' => 'core/rewrite',
'user' => 'core/rewrite',
)]]></core>
<core name="url_locations"><![CDATA[array (
'index' =>
array (
0 => 'core',
),
'news' =>
array (
0 => 'core',
1 => 'core/sef_full',
2 => 'core/sef_noidpage',
3 => 'core/sef_noid',
4 => 'core/sef',
),
'page' =>
array (
0 => 'core',
1 => 'core/sef_chapteronly',
2 => 'core/sef_chapters',
3 => 'core/sef_noid',
4 => 'core/sef',
),
'search' =>
array (
0 => 'core',
1 => 'core/rewrite',
),
'system' =>
array (
0 => 'core',
1 => 'core/rewrite',
),
'user' =>
array (
0 => 'core',
1 => 'core/rewrite',
),
'gallery' =>
array (
0 => 'plugin',
1 => 'plugin/rewrite',
),
)]]></core>
<core name="url_main_module">page</core>
<core name="url_main_module">page</core>
</prefs>
<database>
<dbTable name="generic">
@@ -112,7 +50,7 @@ USA',
<item>
<field name="link_id">2</field>
<field name="link_name">Terms</field>
<field name="link_url">terms-of-use</field>
<field name="link_url">#terms-of-use</field>
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">3</field>
@@ -143,7 +81,7 @@ USA',
</item>
<item>
<field name="link_id">4</field>
<field name="link_name">Contact Us</field>
<field name="link_name">Contact</field>
<field name="link_url">contact.php</field>
<field name="link_description"></field>
<field name="link_button"></field>
@@ -185,78 +123,14 @@ USA',
<field name="link_open">0</field>
<field name="link_rel"></field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_function">page::pagesFromChapter(2)</field>
<field name="link_sefurl"></field>
<field name="link_owner"></field>
</item>
<item>
<field name="link_id">7</field>
<field name="link_name">Article 1</field>
<field name="link_url">article-1</field>
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">1</field>
<field name="link_order">4</field>
<field name="link_parent">6</field>
<field name="link_open">0</field>
<field name="link_rel"></field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_sefurl"></field>
<field name="link_owner"></field>
</item>
<item>
<field name="link_id">8</field>
<field name="link_name">Article 2</field>
<field name="link_url">article-2</field>
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">1</field>
<field name="link_order">5</field>
<field name="link_parent">6</field>
<field name="link_open">0</field>
<field name="link_rel"></field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_sefurl"></field>
<field name="link_owner"></field>
</item>
<item>
<field name="link_id">9</field>
<field name="link_name">Article 3</field>
<field name="link_url">article-3</field>
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">1</field>
<field name="link_order">6</field>
<field name="link_parent">6</field>
<field name="link_open">0</field>
<field name="link_rel"></field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_sefurl"></field>
<field name="link_owner"></field>
</item>
<item>
<field name="link_id">10</field>
<field name="link_name">Gallery</field>
<field name="link_url">{e_PLUGIN}gallery/gallery.php</field>
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">1</field>
<field name="link_order">8</field>
<field name="link_parent">0</field>
<field name="link_open">0</field>
<field name="link_rel"></field>
<field name="link_class">0</field>
<field name="link_function"></field>
<field name="link_sefurl">index</field>
<field name="link_owner">gallery</field>
</item>
<item>
<field name="link_id">11</field>
<field name="link_name">Privacy</field>
<field name="link_url">privacy-policy</field>
<field name="link_url">#privacy-policy</field>
<field name="link_description"></field>
<field name="link_button"></field>
<field name="link_category">3</field>
@@ -270,7 +144,7 @@ USA',
<field name="link_owner"></field>
</item>
<item>
<field name="link_id">12</field>
<field name="link_id">8</field>
<field name="link_name">Contact</field>
<field name="link_url">contact.php</field>
<field name="link_description"></field>

50
install.php
View File

@@ -26,6 +26,7 @@ header('Content-type: text/html; charset=utf-8');
define("e107_INIT", TRUE);
define("DEFAULT_INSTALL_THEME", 'bootstrap5');
define('HELPICON', "<span class='e-tip glyphicon glyphicon-question-sign' style='float:right;padding-top:3px'></span>"); // <i class="glyphicon glyphicon-question-sign"></i>
$e107info = array();
require_once("e107_admin/ver.php");
@@ -586,43 +587,42 @@ class e_install
<div style='width: 100%; padding-left: auto; padding-right: auto;'>
<table class='table table-striped table-bordered' >
<tr>
<td style='border-top: 1px solid #999;'><label for='server'>".LANINS_024."</label></td>
<td style='border-top: 1px solid #999;'><label for='server'>".LANINS_024."</label>".HELPICON."
<span class='field-help'>".LANINS_030."</span></td>
<td style='border-top: 1px solid #999;'>
<input class='form-control input-large' type='text' id='server' name='server' autofocus size='40' value='".varset($this->previous_steps['mysql']['server'],'localhost')."' maxlength='100' required='required' />
<span class='field-help'>".LANINS_030."</span>
</td>
</tr>
<tr>
<td><label for='name'>".LANINS_025."</label></td>
<td><label for='name'>".LANINS_025."</label>".HELPICON."<span class='field-help'>".LANINS_031."</span></td>
<td>
<input class='form-control input-large' type='text' name='name' id='name' value='".varset($this->previous_steps['mysql']['user'])."' size='40' maxlength='100' required='required' />
<span class='field-help'>".LANINS_031."</span>
</td>
</tr>
<tr>
<td><label for='password'>".LANINS_026."</label></td>
<td><label for='password'>".LANINS_026."</label>".HELPICON."<span class='field-help'>".LANINS_032."</span></td>
<td>
<input class='form-control input-large' type='password' name='password' size='40' id='password' value='".varset($this->previous_steps['mysql']['password'])."' maxlength='100' {$isrequired} pattern='[^\x22]+' />
<span class='field-help'>".LANINS_032."</span>
</td>
</tr>
<tr>
<td><label for='db'>".LANINS_027."</label></td>
<td><label for='db'>".LANINS_027."</label>".HELPICON."<span class='field-help'>".LANINS_033."</span></td>
<td class='form-inline'>
<input class='form-control input-large' type='text' name='db' size='20' id='db' value='".varset($this->previous_steps['mysql']['db'])."' maxlength='100' required='required' pattern='^[a-zA-Z0-9][a-zA-Z0-9_-]*' />
<label class='checkbox-inline'><input type='checkbox' name='createdb' value='1' ".($this->previous_steps['mysql']['createdb'] ==1 ? "checked='checked'" : "")." /><small>".LANINS_028."</small></label>
<span class='field-help'>".LANINS_033."</span>
</td>
</tr>
<tr>
<td><label for='prefix'>".LANINS_029."</label></td>
<td><label for='prefix'>".LANINS_029."</label>".HELPICON."<span class='field-help'>".LANINS_034."</span></td>
<td>
<input class='form-control input-large' type='text' name='prefix' size='20' id='prefix' value='e107_' pattern='[a-z0-9]*_$' maxlength='100' required='required' />
<span class='field-help'>".LANINS_034."</span>
</td>
</tr>
</table>
@@ -1091,42 +1091,42 @@ class e_install
<col />
</colgroup>
<tr>
<td><label for='u_name'>".LANINS_072."</label></td>
<td><label for='u_name'>".LANINS_072."</label>".HELPICON."<span class='field-help'>".LANINS_073."</span></td>
<td>
<input class='form-control' type='text' autofocus name='u_name' id='u_name' placeholder='admin' size='30' required='required' value='".(isset($this->previous_steps['admin']['user']) ? $this->previous_steps['admin']['user'] : "")."' maxlength='60' />
<span class='field-help'>".LANINS_073."</span>
</td>
</tr>
<tr>
<td><label for='d_name'>".LANINS_074."</label></td>
<td><label for='d_name'>".LANINS_074."</label>".HELPICON."<span class='field-help'>".LANINS_123."</span></td>
<td>
<input class='form-control' type='text' name='d_name' id='d_name' size='30' placeholder='Administrator' value='".(isset($this->previous_steps['admin']['display']) ? $this->previous_steps['admin']['display'] : "")."' maxlength='60' />
<span class='field-help'>".LANINS_123."</span>
</td>
</tr>
<tr>
<td><label for='pass1'>".LANINS_076."</label></td>
<td><label for='pass1'>".LANINS_076."</label>".HELPICON."<span class='field-help'>".LANINS_124."</span></td>
<td>
<input class='form-control' type='password' name='pass1' size='30' id='pass1' value='' maxlength='60' required='required' />
<span class='field-help'>".LANINS_124."</span>
</td>
</tr>
<tr>
<td><label for='pass2'>".LANINS_078."</label></td>
<td><label for='pass2'>".LANINS_078."</label>".HELPICON."<span class='field-help'>".LANINS_079."</span></td>
<td>
<input class='form-control' type='password' name='pass2' size='30' id='pass2' value='' maxlength='60' required='required' />
<span class='field-help'>".LANINS_079."</span>
</td>
</tr>
<tr>
<td><label for='email'>".LANINS_080."</label></td>
<td><label for='email'>".LANINS_080."</label>".HELPICON."<span class='field-help'>".LANINS_081."</span></td>
<td>
<input class='form-control' type='text' name='email' size='30' id='email' required='required' placeholder='admin@mysite.com' value='".(isset($this->previous_steps['admin']['email']) ? $this->previous_steps['admin']['email'] : '')."' maxlength='100' />
<span class='field-help'>".LANINS_081."</span>
</td>
</tr>
</table>
@@ -1841,14 +1841,8 @@ if($this->pdo == true)
$url_config = eRouter::adminBuildConfig(array(), $url_modules);
$this->previous_steps['prefs']['url_aliases'] = array();
if(empty($pref['url_config']))
{
$this->previous_steps['prefs']['url_config'] = $url_config;
}
$this->previous_steps['prefs']['url_config'] = $url_config;
$this->previous_steps['prefs']['url_modules'] = $url_modules;
$this->previous_steps['prefs']['url_locations'] = $url_locations;
@@ -2494,7 +2488,7 @@ function template_data()
$(document).ready(function()
{
$("input,textarea,select,label,.e-tip").each(function(c) {
$(".e-tip,input,textarea,select,label").each(function(c) {
var t = $(this).nextAll(".field-help");
t.hide();