Skip to content

Commit

Permalink
Merge pull request #23 from tetreum/master
Browse files Browse the repository at this point in the history 
= Fix broken HTML & CSS
  • Loading branch information
@MatteoRagni
MatteoRagni authored Feb 25, 2021
2 parents cddc441 + c5bca51 commit e872f67
Show file tree
Hide file tree
Showing 8 changed files with 248 additions and 263 deletions.
102 changes: 57 additions & 45 deletions amuleweb-main-dload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
.navbar-brand {
padding-top: 5px;
}
.navbar-link:hover {
color: white !important;
}
</style>

<!-- Tasks panel -->
Expand All @@ -53,13 +56,16 @@
text-align: center;
margin: auto;
}
.form-tasks .btn:hover {
color: white !important;
}

#filter {
width: 125px;
height: 28px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;

width: 125px;
height: 28px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}
#category {
width: 125px;
height: 28px;
Expand All @@ -77,7 +83,7 @@

<!-- Tables -->
<style type="css/text">
.panel-tr
.panel-tr {
width: 95%;
margin-left: auto;
margin-right: auto;
Expand Down Expand Up @@ -204,67 +210,67 @@ function formCommandSubmit(command)

<body class="animated fadeIn" style="animation-duration: 1.5s">
<!-- Navigation bar :: This part will be common in all the scripts -->
<nav class="navbar navbar-fixed-top" "role="navigation">
<nav class="navbar navbar-fixed-top" role="navigation">
<div class="container">
<a class="navbar-brand" href="#"><img src="logo-nav.png" class="logo-nav">aMule WebUI</a>
<form class="navbar-form navbar-right" role="form" name="login">
<div class="collapse navbar-collapse">
<div class="btn-group">
<!-- Downloads -->
<a class="btn navbar-link title="Downloads and Uploads" href="amuleweb-main-dload.php">
<span class="glyphicon glyphicon-transfer">
<a class="btn navbar-link" title="Downloads and Uploads" href="amuleweb-main-dload.php">
<span class="glyphicon glyphicon-transfer"></span>
<div style="font-size:9px"><br>Transfer</div>
</span>

</a>
<!-- Shared -->
<a class="btn navbar-link" title="Sharing" href="amuleweb-main-shared.php">
<span class="glyphicon glyphicon-share">
<span class="glyphicon glyphicon-share"></span>
<div style="font-size:9px"><br>Shared</div>
</span>

</a>
<!-- Search -->
<a class="btn navbar-link" title="Search" href="amuleweb-main-search.php">
<span class="glyphicon glyphicon-search">
<span class="glyphicon glyphicon-search"></span>
<div style="font-size:9px"><br>Search</div>
</span>

</a>
<!-- Servers -->
<a class="btn navbar-link" title="Servers" href="amuleweb-main-servers.php">
<span class="glyphicon glyphicon-tasks">
<span class="glyphicon glyphicon-tasks"></span>
<div style="font-size:9px"><br>Server</div>
</span>

</a>
<!-- Kad -->
<a class="btn navbar-link" title="Kademlia" href="amuleweb-main-kad.php">
<span class="glyphicon glyphicon-asterisk">
<span class="glyphicon glyphicon-asterisk"></span>
<div style="font-size:9px"><br>Kad</div>
</span>

</a>
<!-- Stats -->
<a class="btn navbar-link" title="Statistics" href="amuleweb-main-stats.php">
<span class="glyphicon glyphicon-stats">
<span class="glyphicon glyphicon-stats"></span>
<div style="font-size:9px"><br>Stats</div>
</span>

</a>
</div>
<div class="btn-group">
<!-- Configuration -->
<a class="btn navbar-link" title="Configurations" href="amuleweb-main-prefs.php">
<span class="glyphicon glyphicon-cog">
<span class="glyphicon glyphicon-cog"></span>
<div style="font-size:9px"><br>Settings</div>
</span>

</a>
<!-- Log -->
<a class="btn navbar-link" title="Log" href="amuleweb-main-log.php">
<span class="glyphicon glyphicon-flag">
<span class="glyphicon glyphicon-flag"></span>
<div style="font-size:9px"><br>Logs</div>
</span>

</a>
<!-- Exit -->
<a class="btn navbar-link" title="Exit" href="login.php">
<span class="glyphicon glyphicon-off">
<span class="glyphicon glyphicon-off"></span>
<div style="font-size:9px"><br>Exit</div>
</span>

</a>
</div>
</div>
Expand All @@ -280,28 +286,33 @@ function formCommandSubmit(command)
<div class="panel-body container panel-center">
<div class="form-inline form-tasks">
<div class="btn-group">
<a class="btn" href="javascript:formCommandSubmit('pause');" title="Pause"><span class="glyphicon glyphicon-pause">
<div style="font-size:9px"><br>Pause</div>
</span></a>
<a class="btn" href="javascript:formCommandSubmit('resume');" title="Resume"><span class="glyphicon glyphicon-play">
<div style="font-size:9px"><br>Resume</div>
</span></a>
<a class="btn" href="javascript:formCommandSubmit('pause');" title="Pause">
<span class="glyphicon glyphicon-pause"></span>
<div style="font-size:9px"><br>Pause</div>
</a>
<a class="btn" href="javascript:formCommandSubmit('resume');" title="Resume">
<span class="glyphicon glyphicon-play"></span>
<div style="font-size:9px"><br>Resume</div>
</a>
</div>
<div class="btn-group">
<a class="btn" href="javascript:formCommandSubmit('priodown');" title="Lower priority"><span class="glyphicon glyphicon-download">
<div style="font-size:9px"><br>Lower Priority</div>
</span></a>
<a class="btn" href="javascript:formCommandSubmit('cancel');" title="Remove"><span class="glyphicon glyphicon-remove-circle">
<div style="font-size:9px"><br>Remove</div>
</span></a>
<a class="btn" href="javascript:formCommandSubmit('prioup');" title="Higher priority"><span class="glyphicon glyphicon-upload">
<div style="font-size:9px"><br>High Priority</div>
</span></a>
<a class="btn" href="javascript:formCommandSubmit('priodown');" title="Lower priority">
<span class="glyphicon glyphicon-download"></span>
<div style="font-size:9px"><br>Lower Priority</div>
</a>
<a class="btn" href="javascript:formCommandSubmit('cancel');" title="Remove">
<span class="glyphicon glyphicon-remove-circle"></span>
<div style="font-size:9px"><br>Remove</div>
</a>
<a class="btn" href="javascript:formCommandSubmit('prioup');" title="Higher priority">
<span class="glyphicon glyphicon-upload"></span>
<div style="font-size:9px"><br>High Priority</div>
</a>
</div>
<!-- Inserting filtering php -->
<div class="btn-group">
<?php
$all_status = array("all", "Waiting", "Paused", "Downloading");
$all_status = array("all", "Waiting", "Paused", "Downloading");
if ( $HTTP_GET_VARS["command"] == "filter") {
$_SESSION["filter_status"] = $HTTP_GET_VARS["status"];
$_SESSION["filter_cat"] = $HTTP_GET_VARS["category"];
Expand All @@ -323,9 +334,10 @@ function formCommandSubmit(command)
}
echo '</select>';
?>
<a class="btn btn-filter" href="javascript:formCommandSubmit('filter');" title="Filter"><span class="glyphicon glyphicon-filter">
<div style="font-size:9px"><br>Filter</div>
</span></a>
<a class="btn btn-filter" href="javascript:formCommandSubmit('filter');" title="Filter">
<span class="glyphicon glyphicon-filter"></span>
<div style="font-size:9px"><br>Filter</div>
</a>
<?php
if ($_SESSION["guest_login"] != 0) {
echo '<br><br><span class="label label-warning">You logged in as guest - commands are disabled</span>';
Expand Down
38 changes: 16 additions & 22 deletions amuleweb-main-kad.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
.navbar-brand {
padding-top: 5px;
}
.navbar-link:hover {
color: white !important;
}
</style>

<!-- Tables -->
Expand Down Expand Up @@ -224,60 +227,51 @@ function formCommandSubmit(command)
<div class="collapse navbar-collapse">
<div class="btn-group">
<!-- Downloads -->
<a class="btn navbar-link title="Downloads and Uploads" href="amuleweb-main-dload.php">
<span class="glyphicon glyphicon-transfer">
<a class="btn navbar-link" title="Downloads and Uploads" href="amuleweb-main-dload.php">
<span class="glyphicon glyphicon-transfer"></span>
<div style="font-size:9px"><br>Transfer</div>
</span>
</a>
<!-- Shared -->
<a class="btn navbar-link" title="Sharing" href="amuleweb-main-shared.php">
<span class="glyphicon glyphicon-share">
<span class="glyphicon glyphicon-share"></span>
<div style="font-size:9px"><br>Shared</div>
</span>
</a>
<!-- Search -->
<a class="btn navbar-link" title="Search" href="amuleweb-main-search.php">
<span class="glyphicon glyphicon-search">
<span class="glyphicon glyphicon-search"></span>
<div style="font-size:9px"><br>Search</div>
</span>
</a>
<!-- Servers -->
<a class="btn navbar-link" title="Servers" href="amuleweb-main-servers.php">
<span class="glyphicon glyphicon-tasks">
<span class="glyphicon glyphicon-tasks"></span>
<div style="font-size:9px"><br>Server</div>
</span>
</a>
<!-- Kad -->
<a class="btn navbar-link" title="Kademlia" href="amuleweb-main-kad.php">
<span class="glyphicon glyphicon-asterisk">
<span class="glyphicon glyphicon-asterisk"></span>
<div style="font-size:9px"><br>Kad</div>
</span>
</a>
<!-- Stats -->
<a class="btn navbar-link" title="Statistics" href="amuleweb-main-stats.php">
<span class="glyphicon glyphicon-stats">
<span class="glyphicon glyphicon-stats"></span>
<div style="font-size:9px"><br>Stats</div>
</span>
</a>
</div>
<div class="btn-group">
<!-- Configuration -->
<a class="btn navbar-link" title="Configurations" href="amuleweb-main-prefs.php">
<span class="glyphicon glyphicon-cog">
<span class="glyphicon glyphicon-cog"></span>
<div style="font-size:9px"><br>Settings</div>
</span>
</a>
<!-- Log -->
<a class="btn navbar-link" title="Log" href="amuleweb-main-log.php">
<span class="glyphicon glyphicon-flag">
<span class="glyphicon glyphicon-flag"></span>
<div style="font-size:9px"><br>Logs</div>
</span>
</a>
<!-- Exit -->
<a class="btn navbar-link" title="Exit" href="login.php">
<span class="glyphicon glyphicon-off">
<span class="glyphicon glyphicon-off"></span>
<div style="font-size:9px"><br>Exit</div>
</span>
</a>
</div>
</div>
Expand Down Expand Up @@ -314,7 +308,7 @@ function formCommandSubmit(command)
<div class="panel-heading panel-center"><h4>KAD STATUS</h4></div>
<?php
function print_table($kad1, $kad2) {
echo '<table class="table status-table" style="width:auto; margin: 0 auto; margin-bottom: 15px; margin-top:15px;">
echo '<table class="table status-table" style="width:auto; margin: 0 auto; margin-bottom: 15px; margin-top:15px;">
<thead>
<tr>
<th>Parameter</th>
Expand Down Expand Up @@ -344,7 +338,7 @@ function print_kad1($status) {
if ($status["kad_firewalled"] == 0) { return '<span class="label label-success">OK</span>'; }
else { return '<span class="label label-warning">OK</span>'; }
} else {
return '<span class="label label-danger">ERROR</span>';
return '<span class="label label-danger">ERROR</span>';
}
}
function print_kad2($status) {
Expand Down Expand Up @@ -394,7 +388,7 @@ function print_kad2($status) {
echo '<option>', $c, '</option>';
}
?>

</select>
<input class="btn btn-default btn-group" type="submit" name="Submit" value="Download link" onClick="amuleweb-main-dload.php" style="height: 30px;">
</div>
Expand Down
Loading

0 comments on commit e872f67

Please sign in to comment.