release

plugins/community.applications.plg

@@ -2,8 +2,8 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "community.applications">
 <!ENTITY author    "Andrew Zawadzki">
-<!ENTITY version   "2017.10.07">
-<!ENTITY md5       "e482439d9d26b2bbe87434efd3c5be4b">
+<!ENTITY version   "2017.10.19">
+<!ENTITY md5       "784af2d2f0f399e0cc450c9280c0d7ba">
 <!ENTITY launch    "Settings/PluginSettings">
 <!ENTITY plugdir   "/usr/local/emhttp/plugins/&name;">
 <!ENTITY github    "Squidly271/community.applications">
@@ -13,6 +13,13 @@
 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;">
 
 <CHANGES>
+###2017.10.19
+- Enhanced: Don't display back to top if dynamix already does
+- Fixed: Remove some excess files when no longer needed
+- Fixed: Don't display get more results from dockerHub when searching if docker is not enabled
+- Under the hood enhancements to the moderation system
+- Coding improvements
+
 ###2017.10.07
 - Prevent user changing sections before display is rendered
 

source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page

@@ -31,6 +31,7 @@ $vars = parse_ini_file($communityPaths['unRaidVars']);
 $toolTipsterIncluded = version_compare($vars['version'],"6.3.3",">=") ? "true" : "false";
 $unRaid64 = (version_compare($vars['version'],"6.4.0-rc0",">=")) ? "true" : "false";
 $unRaid635 = (version_compare($vars['version'],"6.3.5",">=")) ? "true" : "false";
+$backTopTopIncluded = (version_compare($vars['version'],"6.4.0-rc9f","<=")) ? "false" : "true";
 
 $tabMode = "_self";
 $line_color = $display['theme']=='black' ? '#202020' : '#E8E8E8';
@@ -51,8 +52,8 @@ $pluginInstallPending = @file_get_contents($communityPaths['PluginInstallPending
 <style>
 .searchSubmit{font-family:'FontAwesome';width:29px;height:26px;border:1px solid #dadada;border-radius:0px 4px 4px 0px;font-size:11px;position:relative;padding:0px 2px;background:#DADADA;border:none;cursor:pointer;}
 table#templates_list tbody td.topRow{border-top:1px solid <?=$line_color?>;}
-<?if ( $backToTop == "false" ) : ?>
-.back-to-top {background: none;margin: 0;position: fixed;bottom: 40px;right: 0;width: 50px;height: 50px;z-index: 100;display: none;text-decoration: none;color: #ffffff;}
+<?if ($backTopTopIncluded == "false"):?>
+	.back-to-top {background: none;margin: 0;position: fixed;bottom: 40px;right: 0;width: 50px;height: 50px;z-index: 100;display: none;text-decoration: none;color: #ffffff;}
 <?endif;?>
 input.appButtons {margin:0px;}
 input.viewButton {margin:1px;}
@@ -143,7 +144,7 @@ var checkStaleVar = setInterval(function(){ checkStale(); },60000);
 $(function(){
 	$("#sortorder").attr("data-oldWindowWidth",getWindowWidth());
 
-	if ( ! $(".dynamix_back-to-top").length ) {
+	<?if ($backTopTopIncluded == "false"):?>
 		var backtotopoffset = 250;
 		var backtotopduration = 500;
 		$(window).scroll(function() {
@@ -158,8 +159,7 @@ $(function(){
 			$('html, body').animate({scrollTop: 0}, backtotopduration);
 			return false;
 		});
-	}
-
+	<?endif;?>
 	$('div[id=title]').last().append("<span id='searchFilter' class='status' style='margin-top:-10px;'><input type='text' id='searchBox' class='narrow' placeholder='Search' style='margin-left:10px;margin-right:0' autofocus><button class='searchSubmit' style='margin-right:10px' onclick='doSearch(true)'><i id='searchButton' class='fa fa-search fa-lg'></i></button>");
 
 	if ( "<?=$firstRun?>" == "true" ) { $("#appWarning").show(); }
@@ -1402,8 +1402,8 @@ function resizeDisplay() {
 <div style='width:100%; display:none;' class='multi_installDiv'><center><input class='multi_install multi_installButton' type='button' value='Install Selected Applications' disabled><input type='button' class='multi_installClear' value='Clear Selected' disabled></center></div>
 <?endif;?>
 </center>
-<?if ( $backToTop == "false" ) : ?>
-<a href="#" class="back-to-top" style="display: inline;"><i href="#" class="fa fa-arrow-circle-up dynamix_back-to-top" aria-hidden="true" style="color:green;font-size:25px;"></i></a>
+<?if ($backTopTopIncluded == "false"):?>
+<a href="#" class="back-to-top" style="display:none;"><i href="#" class="fa fa-arrow-circle-up dynamix_back-to-top" aria-hidden="true" style="color:green;font-size:25px;"></i></a>
 <?endif;?>
 <center><a href='https://forums.lime-technology.com/topic/57181-real-docker-faq/' target='_blank'>Docker FAQ</a></center><br>
 <center>Community Applications Version: <?=$installedVersion?></center></div>

source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php

@@ -1975,7 +1975,7 @@ case 'statistics':
 	echo "<div style='overflow:scroll; max-height:550px; height:600px; overflow-x:hidden; overflow-y:hidden;'><center><img height='24px' src='/plugins/community.applications/images/CA.png'><br><font size='3' color='white'>Community Applications</font><br>";
 	echo "<center><font size='2'>Application Feed Statistics</font></center><br><br>";
 	echo "<table>";
-	echo "<tr><td><b>{$color}Application List Updated As Of</b></td><td>$color$updateTime</td></tr>";
+	echo "<tr><td><b>{$color}Last change to application feed</b></td><td>$color$updateTime</td></tr>";
 	echo "<tr><td><b>{$color}Total Number Of Templates</b></td><td>$color{$statistics['totalApplications']}</td></tr>";
 	echo "<tr><td><b>{$color}<a onclick='showModeration(&quot;showRepositories.php&quot;,&quot;Repository List&quot;);' style='cursor:pointer;'>Total Number Of Repositories</a></b></td><td>$color{$statistics['repository']}</td></tr>";
 	echo "<tr><td><b>{$color}Total Number Of Docker Applications</b></td><td>$color{$statistics['docker']}</td></tr>";