Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

card classes added to home page #15369

Closed
wants to merge 3 commits into from
Closed

card classes added to home page #15369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
735a5eb
card classes added to home page
murex971 Jul 2, 2019
de61ac1
Added card classes
murex971 Jul 19, 2019
2c6d46e
removed empty block
murex971 Aug 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/classes/Controllers/HomeController.php
View file
Open in desktop
Expand Up @@ -103,7 +103,7 @@ public function index(): string
'Change password'
),
'id' => 'li_change_password',
'class' => 'no_bullets',
'class' => 'no_bullets list-group-item',
'url' => [
'href' => 'user_password.php' . Url::getCommon(),
'target' => null,
Expand All @@ -129,7 +129,7 @@ public function index(): string
'More settings'
),
'id' => 'li_user_preferences',
'class' => 'no_bullets',
'class' => 'no_bullets list-group-item',
'url' => [
'href' => 'prefs_manage.php' . Url::getCommon(),
'target' => null,
Expand Down
308 changes: 160 additions & 148 deletions templates/home/index.twig
View file
Open in desktop
Expand Up @@ -13,176 +13,188 @@
<div id="main_pane_left" class="col-7 col-xs-12">
{% if has_server %}
{% if is_demo %}
<div class="group">
<h2>{% trans 'phpMyAdmin Demo Server' %}</h2>
<p class="cfg_dbg_demo">
{% filter format('<a href="url.php?url=https://demo.phpmyadmin.net/" target="_blank" rel="noopener noreferrer">demo.phpmyadmin.net</a>')|raw %}
{% trans %}
You are using the demo server. You can do anything here, but please do not change root, debian-sys-maint and pma users. More information is available at %s.
{% endtrans %}
{% endfilter %}
</p>
<div class="group card">
<h2 class="card-header">{% trans 'phpMyAdmin Demo Server' %}</h2>
<div class="card-body">
<p class="cfg_dbg_demo">
{% filter format('<a href="url.php?url=https://demo.phpmyadmin.net/" target="_blank" rel="noopener noreferrer">demo.phpmyadmin.net</a>')|raw %}
{% trans %}
You are using the demo server. You can do anything here, but please do not change root, debian-sys-maint and pma users. More information is available at %s.
{% endtrans %}
{% endfilter %}
</p>
</div>
</div>
{% endif %}

<div class="group">
<h2>{% trans 'General settings' %}</h2>
<ul>
{% if has_server_selection %}
<li id="li_select_server" class="no_bullets">
{{ get_image('s_host') }}
{{ server_selection|raw }}
</li>
{% endif %}
<div class="group card">
<h2 class="card-header">{% trans 'General settings' %}</h2>
<div class="card-body">
<ul class="list-group">
{% if has_server_selection %}
<li id="li_select_server" class="no_bullets list-group-item">
{{ get_image('s_host') }}
{{ server_selection|raw }}
</li>
{% endif %}

{% if server > 0 %}
{{ change_password is not empty ? change_password|raw }}
{% if server > 0 %}
{{ change_password is not empty ? change_password|raw }}

<li id="li_select_mysql_collation" class="no_bullets">
<form class="disableAjax" method="post" action="index.php">
{{ get_hidden_inputs(null, null, 4, 'collation_connection') }}
<label for="select_collation_connection">
{{ get_image('s_asci') }}
{% trans 'Server connection collation:' %}
{{ show_mysql_docu('charset-connection') }}
</label>
{{ server_collation|raw }}
</form>
</li>
{% endif %}
{{ user_preferences is not empty ? user_preferences|raw }}
</ul>
<li id="li_select_mysql_collation" class="no_bullets list-group-item">
<form class="disableAjax" method="post" action="index.php">
{{ get_hidden_inputs(null, null, 4, 'collation_connection') }}
<label for="select_collation_connection">
{{ get_image('s_asci') }}
{% trans 'Server connection collation:' %}
{{ show_mysql_docu('charset-connection') }}
</label>
{{ server_collation|raw }}
</form>
</li>
{% endif %}
{{ user_preferences is not empty ? user_preferences|raw }}
</ul>
</div>
</div>
{% endif %}

<div class="group">
<h2>{% trans 'Appearance settings' %}</h2>
<ul>
{% if language_selector is not empty %}
<li id="li_select_lang" class="no_bullets">
{{ get_image('s_lang') }}
{{ language_selector|raw }}
</li>
{% endif %}
<div class="group card">
<h2 class="card-header">{% trans 'Appearance settings' %}</h2>
<div class="card-body">
<ul class="list-group">
{% if language_selector is not empty %}
<li id="li_select_lang" class="no_bullets list-group-item">
{{ get_image('s_lang') }}
{{ language_selector|raw }}
</li>
{% endif %}

{% if theme_selection is not empty %}
<li id="li_select_theme" class="no_bullets">
{{ get_image('s_theme') }}
{{ theme_selection|raw }}
</li>
{% endif %}
</ul>
{% if theme_selection is not empty %}
<li id="li_select_theme" class="no_bullets list-group-item">
{{ get_image('s_theme') }}
{{ theme_selection|raw }}
</li>
{% endif %}
</ul>
</div>
</div>
</div>

<div id="main_pane_right" class="col-5 col-xs-12">
{% if database_server is not empty %}
<div class="group">
<h2>{% trans 'Database server' %}</h2>
<ul>
<li id="li_server_info">
{% trans 'Server:' %}
{{ database_server.host }}
</li>
<li id="li_server_type">
{% trans 'Server type:' %}
{{ database_server.type }}
</li>
<li id="li_server_connection">
{% trans 'Server connection:' %}
{{ database_server.connection|raw }}
</li>
<li id="li_server_version">
{% trans 'Server version:' %}
{{ database_server.version }}
</li>
<li id="li_mysql_proto">
{% trans 'Protocol version:' %}
{{ database_server.protocol }}
</li>
<li id="li_user_info">
{% trans 'User:' %}
{{ database_server.user }}
</li>
<li id="li_mysql_charset">
{% trans 'Server charset:' %}
<span lang="en" dir="ltr">
{{ database_server.charset }}
</span>
</li>
</ul>
<div class="group card">
<h2 class="card-header">{% trans 'Database server' %}</h2>
<div class="card-body">
<ul>
<li id="li_server_info">
{% trans 'Server:' %}
{{ database_server.host }}
</li>
<li id="li_server_type">
{% trans 'Server type:' %}
{{ database_server.type }}
</li>
<li id="li_server_connection">
{% trans 'Server connection:' %}
{{ database_server.connection|raw }}
</li>
<li id="li_server_version">
{% trans 'Server version:' %}
{{ database_server.version }}
</li>
<li id="li_mysql_proto">
{% trans 'Protocol version:' %}
{{ database_server.protocol }}
</li>
<li id="li_user_info">
{% trans 'User:' %}
{{ database_server.user }}
</li>
<li id="li_mysql_charset">
{% trans 'Server charset:' %}
<span lang="en" dir="ltr">
{{ database_server.charset }}
</span>
</li>
</ul>
</div>
</div>
{% endif %}

{% if web_server is not empty or php_info is not empty %}
<div class="group">
<h2>{% trans 'Web server' %}</h2>
<ul>
{% if web_server is not empty %}
<li id="li_web_server_software">
{{ web_server.software }}
<div class="group card">
<h2 class="card-header">{% trans 'Web server' %}</h2>
<div class="card-body">
<ul>
{% if web_server is not empty %}
<li id="li_web_server_software">
{{ web_server.software }}
</li>
<li id="li_mysql_client_version">
{% trans 'Database client version:' %}
{{ web_server.database }}
</li>
<li id="li_used_php_extension">
{% trans 'PHP extension:' %}
{% for extension in web_server.php_extensions %}
{{ extension }}
{{ show_php_docu('book.' ~ extension ~ '.php') }}
{% endfor %}
</li>
<li id="li_used_php_version">
{% trans 'PHP version:' %}
{{ web_server.php_version }}
</li>
{% endif %}
{% if php_info is not empty %}
{{ php_info|raw }}
{% endif %}
</ul>
</div>
</div>
{% endif %}

<div class="group pmagroup card">
<h2 class="card-header">phpMyAdmin</h2>
<div class="card-body">
<ul>
<li id="li_pma_version"{{ is_version_checked ? ' class="jsversioncheck"' }}>
{% trans 'Version information:' %}
<span class="version">{{ phpmyadmin_version }}</span>
</li>
<li id="li_mysql_client_version">
{% trans 'Database client version:' %}
{{ web_server.database }}
<li id="li_pma_docs">
<a href="{{ get_docu_link('index') }}" target="_blank" rel="noopener noreferrer">
{% trans 'Documentation' %}
</a>
</li>
<li id="li_used_php_extension">
{% trans 'PHP extension:' %}
{% for extension in web_server.php_extensions %}
{{ extension }}
{{ show_php_docu('book.' ~ extension ~ '.php') }}
{% endfor %}
<li id="li_pma_homepage">
<a href="{{ 'https://www.phpmyadmin.net/'|link }}" target="_blank" rel="noopener noreferrer">
{% trans 'Official Homepage' %}
</a>
</li>
<li id="li_used_php_version">
{% trans 'PHP version:' %}
{{ web_server.php_version }}
<li id="li_pma_contribute">
<a href="{{ 'https://www.phpmyadmin.net/contribute/'|link }}" target="_blank" rel="noopener noreferrer">
{% trans 'Contribute' %}
</a>
</li>
{% endif %}
{% if php_info is not empty %}
{{ php_info|raw }}
{% endif %}
</ul>
</div>
{% endif %}

<div class="group pmagroup">
<h2>phpMyAdmin</h2>
<ul>
<li id="li_pma_version"{{ is_version_checked ? ' class="jsversioncheck"' }}>
{% trans 'Version information:' %}
<span class="version">{{ phpmyadmin_version }}</span>
</li>
<li id="li_pma_docs">
<a href="{{ get_docu_link('index') }}" target="_blank" rel="noopener noreferrer">
{% trans 'Documentation' %}
</a>
</li>
<li id="li_pma_homepage">
<a href="{{ 'https://www.phpmyadmin.net/'|link }}" target="_blank" rel="noopener noreferrer">
{% trans 'Official Homepage' %}
</a>
</li>
<li id="li_pma_contribute">
<a href="{{ 'https://www.phpmyadmin.net/contribute/'|link }}" target="_blank" rel="noopener noreferrer">
{% trans 'Contribute' %}
</a>
</li>
<li id="li_pma_support">
<a href="{{ 'https://www.phpmyadmin.net/support/'|link }}" target="_blank" rel="noopener noreferrer">
{% trans 'Get support' %}
</a>
</li>
<li id="li_pma_changes">
<a href="changelog.php{{ get_common() }}" target="_blank">
{% trans 'List of changes' %}
</a>
</li>
<li id="li_pma_license">
<a href="license.php{{ get_common() }}" target="_blank">
{% trans 'License' %}
</a>
</li>
</ul>
<li id="li_pma_support">
<a href="{{ 'https://www.phpmyadmin.net/support/'|link }}" target="_blank" rel="noopener noreferrer">
{% trans 'Get support' %}
</a>
</li>
<li id="li_pma_changes">
<a href="changelog.php{{ get_common() }}" target="_blank">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<a href="changelog.php{{ get_common() }}" target="_blank">
<a href="{{ url('/changelog') }}" target="_blank">

{% trans 'List of changes' %}
</a>
</li>
<li id="li_pma_license">
<a href="license.php{{ get_common() }}" target="_blank">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<a href="license.php{{ get_common() }}" target="_blank">
<a href="{{ url('/license') }}" target="_blank">

{% trans 'License' %}
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
Expand Down