Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-13 19:51:25 +01:00
Code Issues Projects Releases Wiki Activity

Fixed Plugins tab spacing (Analysis)

Browse Source
This commit is contained in:
Rsl1122 2017-09-27 19:26:04 +03:00
parent 511230a186
commit 6eab68a0ca
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plan/src/main/java/com/djrapitops/plan/data/additional/PluginData.java
View File

@ -141,7 +141,8 @@ public abstract class PluginData {
* @see AnalysisType * @see AnalysisType
*/ */
public final String parseContainer(String modifier, String contents) { public final String parseContainer(String modifier, String contents) {
return "<div class=\"plugin-data\">" + (icon.isEmpty() ? "<br>" : Html.FONT_AWESOME_ICON.parse(icon)) + " " + modifier + prefix + contents + suffix + "</div>"; boolean html = analysisTypes.contains(AnalysisType.HTML);
return "<div class=\"plugin-data\">" + (html ? "" : "<p>") + (icon.isEmpty() ? "" : Html.FONT_AWESOME_ICON.parse(icon)) + " " + modifier + prefix + contents + suffix + (html ? "" : "</p>") + "</div>";
} }
/** /**

5
Plan/src/main/java/com/djrapitops/plan/database/tables/UserInfoTable.java
View File

@ -132,6 +132,7 @@ public class UserInfoTable extends UserIDTable {
" WHERE " + columnUserID + "=" + usersTable.statementSelectID + " WHERE " + columnUserID + "=" + usersTable.statementSelectID +
" AND " + columnServerID + "=" + serverTable.statementSelectServerID " AND " + columnServerID + "=" + serverTable.statementSelectServerID
); );
statement.setFetchSize(20000);
statement.setString(1, uuid.toString()); statement.setString(1, uuid.toString());
statement.setString(2, serverUUID.toString()); statement.setString(2, serverUUID.toString());
set = statement.executeQuery(); set = statement.executeQuery();
@ -176,7 +177,7 @@ public class UserInfoTable extends UserIDTable {
" JOIN " + usersTable + " on " + usersIDColumn + "=" + columnUserID + " JOIN " + usersTable + " on " + usersIDColumn + "=" + columnUserID +
" WHERE " + columnServerID + "=" + serverTable.statementSelectServerID " WHERE " + columnServerID + "=" + serverTable.statementSelectServerID
); );
statement.setFetchSize(2000); statement.setFetchSize(20000);
statement.setString(1, serverUUID.toString()); statement.setString(1, serverUUID.toString());
set = statement.executeQuery(); set = statement.executeQuery();
while (set.next()) { while (set.next()) {
@ -214,7 +215,7 @@ public class UserInfoTable extends UserIDTable {
" JOIN " + usersTable + " on " + usersIDColumn + "=" + columnUserID + " JOIN " + usersTable + " on " + usersIDColumn + "=" + columnUserID +
" JOIN " + serverTable + " on " + serverIDColumn + "=" + columnServerID " JOIN " + serverTable + " on " + serverIDColumn + "=" + columnServerID
); );
statement.setFetchSize(5000); statement.setFetchSize(20000);
set = statement.executeQuery(); set = statement.executeQuery();
Map<UUID, List<UserInfo>> serverMap = new HashMap<>(); Map<UUID, List<UserInfo>> serverMap = new HashMap<>();
while (set.next()) { while (set.next()) {

1
Plan/src/main/java/com/djrapitops/plan/database/tables/UsersTable.java
View File

@ -286,6 +286,7 @@ public class UsersTable extends UserIDTable {
" (SELECT " + columnID + " FROM " + nicknamesTable + " (SELECT " + columnID + " FROM " + nicknamesTable +
" WHERE " + nicknamesTable.getColumnNick() + " LIKE LOWER(?))" " WHERE " + nicknamesTable.getColumnNick() + " LIKE LOWER(?))"
); );
statement.setFetchSize(5000);
statement.setString(1, searchString); statement.setString(1, searchString);
statement.setString(2, searchString); statement.setString(2, searchString);

2
Plan/src/main/java/com/djrapitops/plan/utilities/html/HtmlStructure.java
View File

@ -304,7 +304,7 @@ public class HtmlStructure {
html.append("<div class=\"box plugin\">"); html.append("<div class=\"box plugin\">");
for (String ph : pluginPhs) { for (String ph : pluginPhs) {
html.append(ph).append("<br>"); html.append(ph);
} }
html.append("</div></div>"); // Closes column html.append("</div></div>"); // Closes column

9
Plan/src/main/resources/main.css
View File

@ -292,6 +292,15 @@ tr:nth-child(odd) {background: #eee}
margin: 0; margin: 0;
} }
.plugin {
padding: 10px;
}
.plugin p, i, table {
padding: 0;
margin: 0;
}
@media only screen and (max-width: 1680px) { @media only screen and (max-width: 1680px) {
.nav-button { .nav-button {
font-size: 19px; font-size: 19px;