Skip to content

Commit

Permalink
Merge pull request #254 from npds/v16-beta-dev
Browse files Browse the repository at this point in the history 
V16 beta dev
  • Loading branch information
@jipexu
jipexu authored Oct 21, 2017
2 parents 73c0e8f + 6920062 commit 9f3d955
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 35 deletions.
2 changes: 1 addition & 1 deletion revolution_16/admin/settings_save.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ function ConfigSave($xparse,$xsitename,$xnuke_url,$xsite_logo,$xslogan,$xstartda
$content .= "\$NPDS_Prefix = \"$NPDS_Prefix\";\n";
if ($NPDS_Key=="") {$NPDS_Key=uniqid("");}
$content .= "\$NPDS_Key = \"$NPDS_Key\";\n";
$content .= "\$Version_Num = \"v.16.0.7-alpha\";\n";
$content .= "\$Version_Num = \"v.16.0.0-beta\";\n";
$content .= "\$Version_Id = \"NPDS\";\n";
$content .= "\$Version_Sub = \"REvolution\";\n";
$content .= "\n";
Expand Down
2 changes: 1 addition & 1 deletion revolution_16/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@

$NPDS_Prefix = "";
$NPDS_Key = "";
$Version_Num = "v.16.0.7-alpha";
$Version_Num = "v.16.0.0-beta";
$Version_Id = "NPDS";
$Version_Sub = "REvolution";

Expand Down
40 changes: 28 additions & 12 deletions revolution_16/modules/comments/admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
die();
include('functions.php');
include('auth.php');
include('modules/geoloc/geoloc_locip.php');

filtre_module($file_name);
if (file_exists("modules/comments/$file_name.conf.php")) {
if (file_exists("modules/comments/$file_name.conf.php"))
include ("modules/comments/$file_name.conf.php");
} else {
else
die();
}


settype($forum,"integer");
if ($forum>=0)
Expand Down Expand Up @@ -69,11 +70,27 @@
if (!$m = sql_fetch_assoc($r))
forumerror('0014');
echo '
<h3 class="mb-3">'.translate("Users IP and Account information").'</h3>
<div class="card card-body mb-2">
<strong>'.translate("Nickname: ").'</strong> '.$m['uname'].'<br />
<strong>'.translate("User IP: ").'</strong> '.$m['poster_ip'].'<br />
<strong>'.translate("User DNS: ").'</strong> '.$m['poster_dns'].'<br />
<h2 class="mb-3">'.translate("Comment").'</h2>
<div class="card mb-3">
<div class="card-body">
<h3 class="card-title mb-3">'.translate("Users IP and Account information").'</h3>
<div class="row">
<div class="col mb-3">
<span class="text-muted">'.translate("Nickname: ").'</span> '.$m['uname'].'<br />
<span class="text-muted">'.translate("User IP: ").'</span> '.$m['poster_ip'].'<br />
<span class="text-muted">'.translate("User DNS: ").'</span> '.$m['poster_dns'].'<br />
</div>';
echo localiser_ip($iptoshow=$m['poster_ip']);
echo '
</div>
</div>';
include('modules/geoloc/geoloc_conf.php');
if($geo_ip==1)
echo'
<div class="card-footer text-right">
<a href="modules.php?ModPath=geoloc&amp;ModStart=geoloc&amp;op=allip"><span><i class=" fa fa-globe fa-lg mr-1"></i><i class=" fa fa-tv fa-lg mr-2"></i></span><span class="d-none d-sm-inline">Carte des IP</span></a>
</div>';
echo '
</div>
<p><a href="'.rawurldecode($url_ret).'" class="btn btn-secondary">'.translate("Go Back").'</a></p>';
include("footer.php");
Expand All @@ -95,10 +112,9 @@
}
} else {
include("header.php");
opentable();
echo "<p align=\"center\">".translate("You are not the moderator of this forum therefor you cannot perform this function.")."<br /><br />";
echo "<a href=\"javascript:history.go(-1)\" class=\"noir\">".translate("Go Back")."</a></p>";
closetable();
echo '
<p class="text-center">'.translate("You are not the moderator of this forum therefor you cannot perform this function.").'<br /><br />
<a href="javascript:history.go(-1)" class="btn btn-secondary">'.translate("Go Back").'</a></p>';
include("footer.php");
}
?>
49 changes: 28 additions & 21 deletions revolution_16/themes/listskin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
</div>

<div class="bs-component">
<nav class="navbar navbar-expand-md navbar-dark bg-inverse">
<nav class="navbar navbar-expand-md navbar-light bg-inverse">
<a class="navbar-brand" href="#">Navbar</a>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand Down Expand Up @@ -260,32 +260,39 @@
<div class="col-lg-7">

<p class="bs-component">
<button type="button" class="btn btn-primary">Primary</button>
<button type="button" class="btn btn-secondary">Secondary</button>
<button type="button" class="btn btn-success">Success</button>
<button type="button" class="btn btn-info">Info</button>
<button type="button" class="btn btn-warning">Warning</button>
<button type="button" class="btn btn-danger">Danger</button>
<button type="button" class="btn btn-link">Link</button>
<button type="button" class="btn btn-primary mb-3">Primary</button>
<button type="button" class="btn btn-secondary mb-3">Secondary</button>
<button type="button" class="btn btn-success mb-3">Success</button>
<button type="button" class="btn btn-info mb-3">Info</button>
<button type="button" class="btn btn-warning mb-3">Warning</button>
<button type="button" class="btn btn-danger mb-3">Danger</button>
<button type="button" class="btn btn-dark mb-3">Dark</button>
<button type="button" class="btn btn-light mb-3">Light</button>
<button type="button" class="btn btn-link mb-3">Link</button>
</p>

<p class="bs-component">
<button type="button" class="btn btn-primary disabled">Primary</button>
<button type="button" class="btn btn-secondary disabled">Secondary</button>
<button type="button" class="btn btn-success disabled">Success</button>
<button type="button" class="btn btn-info disabled">Info</button>
<button type="button" class="btn btn-warning disabled">Warning</button>
<button type="button" class="btn btn-danger disabled">Danger</button>
<button type="button" class="btn btn-link disabled">Link</button>
<button type="button" class="btn btn-primary disabled mb-3">Primary</button>
<button type="button" class="btn btn-secondary disabled mb-3">Secondary</button>
<button type="button" class="btn btn-success disabled mb-3">Success</button>
<button type="button" class="btn btn-info disabled mb-3">Info</button>
<button type="button" class="btn btn-warning disabled mb-3">Warning</button>
<button type="button" class="btn btn-danger disabled mb-3">Danger</button>
<button type="button" class="btn btn-dark disabled mb-3">Dark</button>
<button type="button" class="btn btn-light disabled mb-3">Light</button>
<button type="button" class="btn btn-link disabled mb-3">Link</button>
</p>

<p class="bs-component">
<button type="button" class="btn btn-outline-primary">Primary</button>
<button type="button" class="btn btn-outline-secondary">Secondary</button>
<button type="button" class="btn btn-outline-success">Success</button>
<button type="button" class="btn btn-outline-info">Info</button>
<button type="button" class="btn btn-outline-warning">Warning</button>
<button type="button" class="btn btn-outline-danger">Danger</button>
<button type="button" class="btn btn-outline-primary mb-3">Primary</button>
<button type="button" class="btn btn-outline-secondary mb-3">Secondary</button>
<button type="button" class="btn btn-outline-success mb-3">Success</button>
<button type="button" class="btn btn-outline-info mb-3">Info</button>
<button type="button" class="btn btn-outline-warning mb-3">Warning</button>
<button type="button" class="btn btn-outline-danger mb-3">Danger</button>
<button type="button" class="btn btn-outline-dark mb-3">Dark</button>
<button type="button" class="btn btn-outline-light mb-3">Light</button>

</p>

<div class="bs-component">
Expand Down

0 comments on commit 9f3d955

Please sign in to comment.