kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[enh] testing JS packages dependencies instead of including our own copy

This commit is contained in:
Benjamin Sonntag 2018-06-24 16:09:11 +02:00
parent 2d7601e4e0
commit 404ba2803b
8 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bureau/admin/head.php
View File

@ -32,9 +32,10 @@ if (!isset($charset) || ! $charset) $charset="UTF-8";
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
<title><?php __("AlternC Control Panel"); ?></title>
<link rel="stylesheet" href="js/jquery_ui/css/redmond/jquery-ui-1.10.3.custom.min.css" type="text/css" />
<link rel="stylesheet" href="/javascript/jquery-ui-themes/redmond/jquery-ui.min.css" type="text/css" />
<link rel="stylesheet" href="/javascript/prettify/prettify.css" type="text/css" />
<link rel="stylesheet" href="styles/style.css" type="text/css" />
<link rel="stylesheet" href="styles/solid.css" type="text/css" />
<link rel="stylesheet" href="styles/solid.css" type="text/css" /><!-- fontawesome solid font -->
<link rel="stylesheet" href="styles/fontawesome.css" type="text/css" />
<?php
if (file_exists("styles/style-custom.css") ) {
@ -42,20 +43,16 @@ if (file_exists("styles/style-custom.css") ) {
}
$favicon = variable_get('favicon', 'favicon.ico' ,'You can specify a favicon, for example /images/my_logo.ico', array('desc'=>'URL','type'=>'string'));
?>
<link rel="Shortcut Icon" href="<?php echo $favicon;?>" type="image/ico" />
<link rel="icon" href="<?php echo $favicon;?>" type="image/ico" />
<script src="js/alternc.js" type="text/javascript" ></script>
<script src="js/jquery.min_embedded.js" type="text/javascript"></script>
<script src="js/jquery_ui/js/jquery-ui-1.10.3.custom.min.js" type="text/javascript"></script>
<script src="js/jquery.tablesorter.min.js" type="text/javascript"></script>
<link href="prettify/prettify.css" type="text/css" rel="stylesheet" />
<script src="prettify/prettify.js" type="text/javascript"></script>
<script src="/javascript/jquery/jquery.min.js" type="text/javascript"></script>
<script src="/javascript/jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
<script src="/javascript/jquery-tablesorter/jquery.tablesorter.min.js" type="text/javascript"></script>
<script src="/javascript/prettify/prettify.js" type="text/javascript"></script>
</head>
<body onload="prettyPrint()">

5
bureau/admin/js/alternc.js
View File

@ -103,7 +103,10 @@ function shuffleArray(array) {
}
function generate_password_html(id, size, field1, field2, classcount) {
$("#z"+id).html("<input id='inp"+id+"' type='textbox' size=8 readonly='readonly' value='"+generate_password(size, classcount)+"' />&nbsp;<a href='javascript:generate_password_html("+id+","+size+",\""+field1+"\",\""+field2+"\");'><img src='/images/refresh.png' alt='Refresh' title='Refresh'/></a>");
$("#z"+id).html("<input id='inp"+id+
"' type='textbox' size=8 readonly='readonly' value='"+generate_password(size, classcount)+
"' />&nbsp;<a href='javascript:generate_password_html("+id+","+size+",\""+field1+"\",\""+field2+
"\");'><img src='/images/refresh.png' alt='Refresh' title='Refresh'/></a>");
$("#inp"+id).focus();
$("#inp"+id).select();
if (field1 != "") { $(field1).val( $("#inp"+id).val() ); }

6
bureau/admin/js/jquery.min_embedded.js
View File

File diff suppressed because one or more lines are too long

4
bureau/admin/js/jquery.tablesorter.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
bureau/admin/prettify
View File

@ -1 +0,0 @@
/usr/share/javascript/prettify

8
debian/control vendored
View File

@ -21,6 +21,10 @@ Depends: debianutils (>= 1.13.1)
, phpmyadmin
, ssl-cert
, libjs-prettify
, libjs-jquery
, libjs-jquery-tablesorter
, libjs-jquery-ui
, libjs-jquery-ui-theme-redmond
, postfix
, proftpd-mod-mysql
, proftpd-basic
@ -105,6 +109,10 @@ Depends: debianutils (>= 1.13.1)
, phpmyadmin
, ssl-cert
, libjs-prettify
, libjs-jquery
, libjs-jquery-tablesorter
, libjs-jquery-ui
, libjs-jquery-ui-theme-redmond
, postfix
, proftpd-mod-mysql
, proftpd-basic

9
etc/alternc/templates/alternc/bureau.conf
View File

@ -35,3 +35,12 @@
# will be used to define aliases such as /javascript /webmail /squirrelmail ...
IncludeOptional /etc/alternc/apache-panel.d/*.conf
# we depend on prettify, libjs-jquery libjs-jquery-tablesorter
# for the panel, so we ensure the /javascript alias is there:
Alias /javascript /usr/share/javascript/
<Directory "/usr/share/javascript/">
Options +FollowSymLinks +MultiViews
Require all granted
ExpiresDefault "access plus 1 month"
</Directory>

4
install/alternc.install
View File

@ -347,6 +347,10 @@ if [ -x /usr/sbin/apache2 ]; then
then
a2enmod rewrite
fi
if ! [ -L /etc/apache2/mods-enabled/expires.load ]
then
a2enmod expires
fi
if [ ! -h /etc/apache2/conf-available/alternc-ssl.conf ] && [ -e /etc/apache2/conf-available/ ]; then
ln -sf /etc/alternc/apache2-ssl.conf /etc/apache2/conf-available/alternc-ssl.conf