dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the fieldset and label as the alignment is not working with bootstrap.

Browse Source
This commit is contained in:
markjcrane
2016-03-26 13:09:22 -06:00
parent ae125390c3
commit 9c49a0ce54
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/install/install.php
+4 -10
View File
@@ -50,8 +50,8 @@
$db_create_username = ''; $db_create_username = '';
$db_create_password = ''; $db_create_password = '';
//detect the iso country code from the locale - //detect the iso country code from the locale
//TBD $locale = Locale::getDefault(); //$locale = Locale::getDefault();
$timezone = 'UTC'; $timezone = 'UTC';
if (is_link('/etc/localtime')) { if (is_link('/etc/localtime')) {
// Mac OS X (and older Linuxes) // Mac OS X (and older Linuxes)
@@ -206,7 +206,7 @@
echo " <input type='hidden' name='return_install_step' value='select_language'/>\n"; echo " <input type='hidden' name='return_install_step' value='select_language'/>\n";
echo " <input type='hidden' name='install_step' value='detect_config'/>\n"; echo " <input type='hidden' name='install_step' value='detect_config'/>\n";
echo " <div style='text-align:right'>\n"; echo " <div style='text-align:right'>\n";
echo " <button type='submit' class='btn' id='next'>".$text['button-next']."</button>\n"; echo " <input type='submit' class='btn' id='next'>".$text['button-next']."</button>\n";
echo " </div>\n"; echo " </div>\n";
echo "</form>\n"; echo "</form>\n";
} elseif($install_step == 'detect_config'){ } elseif($install_step == 'detect_config'){
@@ -336,12 +336,6 @@
//$_SESSION['permissions'][]['permission_name'] = 'superadmin'; //$_SESSION['permissions'][]['permission_name'] = 'superadmin';
//$_SESSION['menu'] = ''; //$_SESSION['menu'] = '';
//show errors
ini_set('display_errors', '1');
//error_reporting (E_ALL); // Report everything
//error_reporting (E_ALL ^ E_NOTICE); // Report everything
error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING ); //hide notices and warnings
//add the content to the template and then send output //add the content to the template and then send output
$body = ob_get_contents(); //get the output from the buffer $body = ob_get_contents(); //get the output from the buffer
ob_end_clean(); //clean the buffer ob_end_clean(); //clean the buffer
@@ -349,6 +343,7 @@
//set a default template //set a default template
$default_template = 'default'; $default_template = 'default';
$_SESSION['domain']['template']['name'] = $default_template; $_SESSION['domain']['template']['name'] = $default_template;
$_SESSION['theme']['menu_brand_type']['text'] = "text";
//set the default template path //set the default template path
$template_path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes/'.$default_template.'/template.php'; $template_path = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes/'.$default_template.'/template.php';
@@ -369,7 +364,6 @@
eval('?>' . $template_content . '<?php '); eval('?>' . $template_content . '<?php ');
$content = ob_get_contents(); //get the output from the buffer $content = ob_get_contents(); //get the output from the buffer
ob_end_clean(); //clean the buffer ob_end_clean(); //clean the buffer
//echo $content;
//send the content to the browser and then clear the variable //send the content to the browser and then clear the variable
echo $content; echo $content;
core/install/resources/page_parts/install_select_language.php
+10 -10
View File
@@ -36,21 +36,21 @@
echo " ".$text['label-select_language']."\n"; echo " ".$text['label-select_language']."\n";
echo " </td>\n"; echo " </td>\n";
echo " <td class='vtable' align='left'>\n"; echo " <td class='vtable' align='left'>\n";
echo " <fieldset class='container'>"; echo " <table>";
foreach($_SESSION['app']['languages'] as $lang_code){ foreach($_SESSION['app']['languages'] as $lang_code){
echo " <fieldset class='container'>"; echo " <tr>";
echo " <label class='radio' style='width:200px;'>"; echo " <td>\n";
echo " <input type='radio' name='install_language' value='$lang_code' id='lang_$lang_code' onchange='JavaScript:disable_next()'"; echo " <input type='radio' name='install_language' value='$lang_code' id='lang_$lang_code' ";
if($lang_code == $_SESSION['domain']['language']['code']) if($lang_code == $_SESSION['domain']['language']['code']) {
{
echo " checked='checked'"; echo " checked='checked'";
} }
echo "/>"; echo "/>";
echo " <img src='<!--{project_path}-->/core/install/resources/images/flags/$lang_code.png' alt='$lang_code'/>&nbsp;".$text["language-$lang_code"];
echo " </label>\n"; echo " <img src='<!--{project_path}-->/core/install/resources/images/flags/$lang_code.png' alt='$lang_code'/>&nbsp;".$text["language-$lang_code"];
echo " </fieldset>"; echo " </td>";
echo " </tr>";
} }
echo " </fieldset>"; echo " </table>";
echo " <br />\n"; echo " <br />\n";
echo " ".$text['description-select_language']."\n"; echo " ".$text['description-select_language']."\n";
echo " </td>\n"; echo " </td>\n";