Skip to content

Commit

Permalink
More Fixes and Cosmetic Changes
Browse files Browse the repository at this point in the history 
Fixed #41 #46 #47 #48
  • Loading branch information
@causefx
causefx committed Jan 20, 2017
1 parent 7fe65e1 commit ceb87ab
Show file tree
Hide file tree
Showing 8 changed files with 3,465 additions and 35 deletions.
3,272 changes: 3,272 additions & 0 deletions bower_components/animate.css/animate.css
View file

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions bower_components/animate.css/animate.min.css
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion check.php
View file
Expand Up @@ -162,7 +162,6 @@ function getFilePermission($file) {

check("PDO_SQLITE");
check("PDO");
check("curl");
check("Zip");
checkFunction("MAIL");
checkFunction("fopen");
Expand Down
Binary file added images/radarr.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions index.php
View file
Expand Up @@ -234,7 +234,7 @@ function write_ini_file($content, $path) {

<link rel="stylesheet" href="<?=$baseURL;?>css/style.css">


<link rel="icon" type="image/png" href="<?=$baseURL;?>images/favicon/android-chrome-192x192.png" sizes="192x192">
<link rel="apple-touch-icon" sizes="180x180" href="<?=$baseURL;?>images/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" href="<?=$baseURL;?>images/favicon/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="<?=$baseURL;?>images/favicon/favicon-16x16.png" sizes="16x16">
Expand Down Expand Up @@ -446,7 +446,7 @@ function write_ini_file($content, $path) {
<?php if($row['iconurl']) : ?>

<i style="font-size: 19px; padding: 0 10px; font-size: 19px;">
<img src="<?=$row['iconurl'];?>" style="height: 30px; margin-top: -2px;">
<img src="<?=$row['iconurl'];?>" style="height: 30px; width: 30px; margin-top: -2px;">
</i>

<?php else : ?>
Expand Down Expand Up @@ -719,7 +719,7 @@ function write_ini_file($content, $path) {
</div>
<?php endif; endif; ?>
<?php if($tabSetup == "No" && $needSetup == "No") :?>
<div id="tabEmpty" class="table-wrapper" style="display: none">
<div id="tabEmpty" class="table-wrapper" style="display: none; background:<?=$sidebar;?>;">

<div class="table-row">

Expand All @@ -729,9 +729,9 @@ function write_ini_file($content, $path) {

<div class="content-box">

<div class="red-bg biggest-box">
<div class="biggest-box" style="background:<?=$topbar;?>;">

<h1 class="zero-m text-uppercase">Hold Up!</h1>
<h1 class="zero-m text-uppercase" style="color:<?=$topbartext;?>;">Hold Up!</h1>

</div>

Expand Down Expand Up @@ -891,13 +891,13 @@ function write_ini_file($content, $path) {
<input type="hidden" name="op" value="login">
<input type="hidden" name="sha1" value="">
<input type="hidden" name="rememberMe" value="false"/>
<input type="text" class="form-control material" name="username" placeholder="Username" autocorrect="off" autocapitalize="off" value="" autofocus required>
<input type="text" class="form-control material" name="username" placeholder="Username" autocomplete="off" autocorrect="off" autocapitalize="off" value="" autofocus required>

</div>

<div class="form-group">

<input type="password" class="form-control material" name="password1" placeholder="Password" required>
<input type="password" class="form-control material" name="password1" value="" autocomplete="off" placeholder="Password" required>

</div>

Expand All @@ -917,7 +917,7 @@ function write_ini_file($content, $path) {

</form>

<button id="switchForgot" class="btn btn-block btn-info text-uppercase waves">Forgot Password</button>
<button id="switchForgot" style="background:<?=$topbartext;?>;" class="btn btn-block btn-info text-uppercase waves"><text style="color:<?=$topbar;?>;">Forgot Password</text></button>

<form style="display: none;" name="forgotPassword" id="forgotPassword" action="" method="POST" data-smk-icon="glyphicon-remove-sign">

Expand Down
4 changes: 2 additions & 2 deletions js/addtohomescreen.js
View file
Expand Up @@ -176,8 +176,8 @@ ath.defaults = {
skipFirstVisit: false, // show only to returning visitors (ie: skip the first time you visit)
startDelay: 1, // display the message after that many seconds from page load
lifespan: 15, // life of the message in seconds
displayPace: 60, // minutes before the message is shown again (0: display every time, default 24 hours)
maxDisplayCount: 0, // absolute maximum number of times the message will be shown to the user (0: no limit)
displayPace: 10880, // minutes before the message is shown again (0: display every time, default 24 hours)
maxDisplayCount: 2, // absolute maximum number of times the message will be shown to the user (0: no limit)
icon: true, // add touch icon to the message
message: '', // the message can be customized
validLocation: [], // list of pages where the message will be shown (array of regexes)
Expand Down
157 changes: 136 additions & 21 deletions settings.php
View file
Expand Up @@ -160,6 +160,14 @@ function printArray($arrayName){

endif;

if($action == "deleteLog") :

unlink(FAIL_LOG);

echo "<script type='text/javascript'>window.location.replace('settings.php');</script>";

endif;

if($action == "upgrade") :

function downloadFile($url, $path){
Expand Down Expand Up @@ -522,7 +530,8 @@ function rcopy($src, $dst) {

<script src="js/menu/modernizr.custom.js"></script>
<script type="text/javascript" src="js/sha1.js"></script>
<script type="text/javascript" src="js/user.js"></script>
<script type="text/javascript" src="js/user.js"></script>
<link rel="stylesheet" href="bower_components/animate.css/animate.min.css">

<link rel="stylesheet" href="css/style.css">
<link href="css/jquery.filer.css" rel="stylesheet">
Expand All @@ -540,8 +549,10 @@ function rcopy($src, $dst) {
<style>

input.form-control.material.icp-auto.iconpicker-element.iconpicker-input {
display: none;
}
display: none;
}input.form-control.iconpicker-search {
color: black;
}

</style>

Expand All @@ -560,7 +571,7 @@ function rcopy($src, $dst) {

<div class="tabbable tabs-with-bg" id="eighth-tabs">

<ul class="nav nav-tabs" style="background: #76828e">
<ul class="nav nav-tabs" style="background: #C0C0C0">

<li class="active">

Expand All @@ -578,17 +589,23 @@ function rcopy($src, $dst) {

<a href="#useredit" data-toggle="tab"><i class="fa fa-user red"></i></a>

</li>

<li>

<a href="#loginlog" data-toggle="tab"><i class="fa fa-file-text-o indigo"></i></a>

</li>

<li>

<a href="#about" data-toggle="tab"><i class="fa fa-info indigo"></i></a>
<a href="#about" data-toggle="tab"><i class="fa fa-info red-orange"></i></a>

</li>

</ul>

<div class="tab-content">
<div class="tab-content" style="overflow: auto">

<div class="content-box box-shadow big-box todo-list tab-pane big-box fade in active" id="tab-tabs">

Expand Down Expand Up @@ -629,11 +646,9 @@ function rcopy($src, $dst) {
<div class="row">

<textarea id="copyTarget" class="hideCopy" style="left: -9999px; top: 0; position: absolute;"></textarea>
<!-- style="height: 1px; width: 0px; display: block;"!-->
<?php
$dirname = "images/";
$images = scandir($dirname);
//shuffle($images);
$ignore = Array(".", "..", "favicon/", "favicon", "._.DS_Store", ".DS_Store");
foreach($images as $curimg){
if(!in_array($curimg, $ignore)) { ?>
Expand Down Expand Up @@ -675,7 +690,7 @@ function rcopy($src, $dst) {

</form>

<div class="panel" style="overflow: auto">
<div class="panel">

<form id="submitTabs" method="post">

Expand Down Expand Up @@ -979,6 +994,102 @@ function rcopy($src, $dst) {

</div>

<div class="tab-pane big-box fade in" id="loginlog">

<div class="content-box big-box">

<div class="table-responsive">

<?php if(file_exists(FAIL_LOG)) : ?>

<form id="deletelog" method="post">

<input type="hidden" name="action" value="deleteLog" />
<button class="btn waves btn-labeled btn-danger btn-sm pull-right text-uppercase waves-effect waves-float" type="submit">

<span class="btn-label"><i class="fa fa-trash"></i></span>Purge Log

</button>

</form>

<table class="table table-striped">

<thead>

<tr>

<th>Date</th>

<th>Username</th>

<th>IP Address</th>

<th>Type</th>

</tr>

</thead>

<tbody>

<?php

$getFailLog = file_get_contents(FAIL_LOG);
$gotFailLog = json_decode($getFailLog, true);

function getColor($colorTest){

if($colorTest == "bad_auth") :

$gotColorTest = "danger";

elseif($colorTest == "good_auth") :

$gotColorTest = "primary";

endif;

echo $gotColorTest;

}

foreach (array_reverse($gotFailLog["auth"]) as $key => $val) : ?>

<tr>

<td><?=$val["date"];?></td>

<td><?=$val["username"];?></td>

<td><?=$val["ip"];?></td>

<td><span class="label label-<?php getColor($val["auth_type"]);?>"><?=$val["auth_type"];?></span></td>

</tr>

<?php endforeach; ?>

</tbody>

</table>

<?php endif;

if(!file_exists(FAIL_LOG)) :

echo "Nothing in log..................";

endif;

?>

</div>

</div>

</div>

<div class="tab-pane big-box fade in" id="about">

<h4><strong>About Organizr</strong></h4>
Expand Down Expand Up @@ -1063,13 +1174,6 @@ function rcopy($src, $dst) {

</div>

<!-- <button id="plexTheme" style="background: #E49F0C" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Plex</button>
<button id="embyTheme" style="background: #52B54B" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Emby</button>
<button id="bookTheme" style="background: #3B5998" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Book</button>
<button id="spaTheme" style="background: #66BBAE" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Spa</button>
<button id="darklyTheme" style="background: #375A7F" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Darkly</button>
<button id="slateTheme" style="background: #272B30" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Slate</button> -->

<button class="btn waves btn-labeled btn-success btn-sm pull-right text-uppercase waves-effect waves-float" type="submit">

<span class="btn-label"><i class="fa fa-floppy-o"></i></span>Save Options
Expand Down Expand Up @@ -1397,9 +1501,20 @@ className: $("#" + newid).attr("data-bg"),
//Remove one completed item
$(document).on('click', '.trash', function (e) {

var clearedCompItem = $(this).closest(".list-group-item").remove();
e.preventDefault();
count();
var listItemRemove = $(this).closest(".list-group-item");
var animation = "zoomOutRight";
var container = $(this).closest(".list-group-item");

//container.attr('class', 'list-group-item gray-bg animation-container');
container.addClass('animated ' + animation);

setTimeout(function() {
var clearedCompItem = listItemRemove.remove();
console.log("removed");
e.preventDefault();
count();
}, 800);


});

Expand Down Expand Up @@ -1679,7 +1794,7 @@ function changeColor(elementName, elementColor) {
dataType: "json",
success: function(github) {

var currentVersion = "0.99";
var currentVersion = "0.994";
var githubVersion = github.tag_name;
var githubDescription = github.body;
var githubName = github.name;
Expand Down

0 comments on commit ceb87ab

Please sign in to comment.