Subversion Repositories oidplus

Compare Revisions

No changes between revisions

Regard whitespace Rev 214 → Rev 215

/trunk/oidplus.js
Cannot display: file marked as a binary type.
svn:mime-type = application/javascript
Property changes:
Deleted: svn:mime-type
-application/javascript
\ No newline at end of property
/trunk/oidplus.css
File deleted
Property changes:
Deleted: svn:mime-type
-text/css
\ No newline at end of property
/trunk/3p/cookieconsent/cookieconsent.min.js
File deleted
\ No newline at end of file
/trunk/3p/cookieconsent/cookieconsent.min.css
File deleted
\ No newline at end of file
/trunk/3p/_overview
51,11 → 51,6
Version: 1.03
Download: http://www.spamspan.de/
 
Cookie consent:
License: MIT
Version: 2018-07-17
Download: https://github.com/insites/cookieconsent (only build directory)
 
ReCaptcha:
License: BSD 3-Clause "New" or "Revised" License
Currently directly linked
/trunk/TODO
129,6 → 129,8
 
PRIVACY:
- make a config.inc.php setting to disable POLYFILL.IO feature
- bring back "3p/cookiecontent"? DM 28 May 2019: Removed CookieConsent temporarily, because it is placed at the beginning of the page and therefore ruins the Google index ...
=> We might not need it, because cookies are only set during login, and at the login page itself, we already warn about cookies, in addition to the Privacy documentation
 
GUID Management
- Leaf nodes (GUIDs) should show/edit the Title in the CRUD, so you dont have to click the GUID to see the title
/trunk/index.php
109,55 → 109,18
<meta name="OIDplus-SystemURL" content="<?php echo htmlentities($sys_url); ?>">
<meta name="OIDplus-SystemVersion" content="<?php echo htmlentities($sys_ver); ?>">
<meta name="OIDplus-SystemInstallType" content="<?php echo htmlentities($sys_install_type); ?>">
<meta name="OIDplus-SystemTitle" content="<?php echo htmlentities($sys_title); /* Do not remove. This meta tag is acessed via JS */ ?>">
<meta name="OIDplus-SystemTitle" content="<?php echo htmlentities($sys_title); /* Do not remove. This meta tag is acessed by oidplus_base.js */ ?>">
<meta name="theme-color" content="#A9DCF0">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
<title><?php echo combine_systemtitle_and_pagetitle(OIDplus::config()->systemTitle(), $static_title); ?></title>
 
<!-- We are using jQuery 2.2.1, because 3.3.1 seems to be incompatible with jsTree (HTML content will not be loaded into jsTree!) TODO: File bug report -->
<script src="3p/jquery/jquery-2.2.1.min.js"></script>
<script src="3p/bootstrap/js/bootstrap.min.js"></script>
<script src="3p/jstree/jstree.min.js"></script>
<script src='3p/tinymce/tinymce.min.js'></script>
<script src="3p/jquery-ui/jquery-ui.min.js"></script>
<script src="3p/layout/jquery.layout.min.js"></script>
<script src="3p/spamspan/spamspan.js"></script>
<script src="3p/bignumber.js/bignumber.min.js"></script>
<script src="3p/sha3_js/sha3.js"></script><!-- https://github.com/emn178/js-sha3 -->
<?php
if (RECAPTCHA_ENABLED) {
?>
<script src="https://www.google.com/recaptcha/api.js"></script>
<?php
}
?>
<?php if (RECAPTCHA_ENABLED) { ?><script src="https://www.google.com/recaptcha/api.js"></script><?php } ?>
 
<script src="oidplus.min.js.php"></script>
 
<link rel="stylesheet" href="<?php echo htmlentities($css); ?>">
 
<link rel="shortcut icon" type="image/x-icon" href="img/favicon.ico">
 
<!-- DM 28 May 2019: Removed CookieConsent temporarily, because it is placed at the beginning of the page and therefore ruins the Google index ... -->
<!-- We might not need it, because cookies are only set during login, and at the login page we already warn about cookies -->
<!-- TODO: Bring back? -->
<!-- <link rel="stylesheet" type="text/css" href="3p/cookieconsent/cookieconsent.min.css">
<script src="3p/cookieconsent/cookieconsent.min.js"></script>
<script>
window.addEventListener("load", function(){
window.cookieconsent.initialise({
"palette": {
"popup": {
"background": "#edeff5",
"text": "#838391"
},
"button": {
"background": "#4b81e8"
}
},
"position": "bottom-right"
})});
</script> -->
</head>
 
<body>
/trunk/oidplus.min.css.php
36,17 → 36,18
# ---
 
function process_file($filename) {
$dir = dirname((strpos($filename, __DIR__.'/') === 0) ? substr($filename, strlen(__DIR__.'/')) : $filename);
if (DO_MINIFY) {
$minifier = new Minify\CSS(__DIR__.'/'.$filename);
$minifier = new Minify\CSS($filename);
$cont = $minifier->minify();
$cont = str_ireplace("url(data:", "url###(data:", $cont);
$cont = str_ireplace("url(", "url(".dirname($filename).'/', $cont);
$cont = str_ireplace("url(", "url(".$dir.'/', $cont);
} else {
$cont = file_get_contents(__DIR__.'/'.$filename);
$cont = file_get_contents($filename);
$cont = str_ireplace('url("data:', 'url###("data:', $cont);
$cont = str_ireplace('url("', 'url("'.dirname($filename).'/', $cont);
$cont = str_ireplace('url("', 'url("'.$dir.'/', $cont);
$cont = str_ireplace("url('data:", "url###('data:", $cont);
$cont = str_ireplace("url('", "url('".dirname($filename).'/', $cont);
$cont = str_ireplace("url('", "url('".$dir.'/', $cont);
}
$cont = str_ireplace("url###(", "url(", $cont);
return $cont;
54,7 → 55,7
 
# ---
 
$out .= process_file('oidplus.css')."\n\n";
$out .= process_file(__DIR__ . '/oidplus_base.css')."\n\n";
 
foreach (array('publicPages','adminPages','raPages') as $pudir) {
$ary = glob(__DIR__ . '/plugins/'.$pudir.'/'.'*'.'/style.css');
62,9 → 63,9
foreach ($ary as $a) $out .= process_file($a);
}
 
$out .= process_file('3p/jstree/themes/default/style.css')."\n\n";
$out .= process_file('3p/jquery-ui/jquery-ui.css')."\n\n";
$out .= process_file('3p/bootstrap/css/bootstrap.css')."\n\n";
$out .= process_file(__DIR__ . '/3p/jstree/themes/default/style.css')."\n\n";
$out .= process_file(__DIR__ . '/3p/jquery-ui/jquery-ui.css')."\n\n";
$out .= process_file(__DIR__ . '/3p/bootstrap/css/bootstrap.css')."\n\n";
 
# ---
 
/trunk/oidplus.min.js.php
25,20 → 25,44
 
error_reporting(E_ALL);
 
$minifier = new Minify\JS(__DIR__ . '/oidplus.js');
$files = array();
 
$files[] = __DIR__ . '/3p/jquery/jquery-2.2.1.min.js'; // We are using jQuery 2.2.1, because 3.3.1 seems to be incompatible with jsTree (HTML content will not be loaded into jsTree!) TODO: File bug report
$files[] = __DIR__ . '/3p/bootstrap/js/bootstrap.min.js';
$files[] = __DIR__ . '/3p/jstree/jstree.min.js';
$files[] = __DIR__ . '/3p/tinymce/tinymce.min.js';
$files[] = __DIR__ . '/3p/jquery-ui/jquery-ui.min.js';
$files[] = __DIR__ . '/3p/layout/jquery.layout.min.js';
$files[] = __DIR__ . '/3p/spamspan/spamspan.js';
$files[] = __DIR__ . '/3p/bignumber.js/bignumber.min.js';
$files[] = __DIR__ . '/3p/sha3_js/sha3.js'; // https://github.com/emn178/js-sha3
 
$files[] = __DIR__ . '/oidplus_base.js';
 
$ary = glob(__DIR__ . '/plugins/publicPages/'.'*'.'/script.js');
sort($ary);
foreach ($ary as $a) $minifier->add($a);
foreach ($ary as $a) $files[] = $a;
 
$ary = glob(__DIR__ . '/plugins/adminPages/'.'*'.'/script.js');
sort($ary);
foreach ($ary as $a) $minifier->add($a);
foreach ($ary as $a) $files[] = $a;
 
$ary = glob(__DIR__ . '/plugins/raPages/'.'*'.'/script.js');
sort($ary);
foreach ($ary as $a) $minifier->add($a);
foreach ($ary as $a) $files[] = $a;
 
# ---
 
$minifier = null;
 
foreach ($files as $file) {
if (is_null($minifier)) {
$minifier = new Minify\JS($file);
} else {
$minifier->add($file);
}
}
 
$out = $minifier->minify();
$etag = md5($out);
header("Etag: $etag");
/trunk/oidplus_base.css
0,0 → 1,432
/*
* OIDplus 2.0
* Copyright 2019 Daniel Marschall, ViaThinkSoft
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
 
@media print {
/* Printing */
.ui-layout-west, .ui-layout-resizer {
display:none !important;
}
.ui-layout-center {
left:0px !important;
width:100% !important;
}
#oidtree, .ui-layout-center {
position:relative !important;
width:100% !important;
top: 0 !important;
}
#content_window {
top: 0 !important;
}
}
 
@media only screen and (max-width: 800px) {
/* Mobile */
.ui-layout-west, .ui-layout-resizer {
display:none !important;
}
.ui-layout-center {
left:0px !important;
width:100% !important;
}
#oidtree, .ui-layout-center {
position:relative !important;
width:100% !important;
top: 0 !important;
}
#content_window {
top: 0 !important;
}
#frames {
display:flex;
flex-direction:column;
align-items: flex-start;
}
#system_title_bar {
order:0;
flex:none;
}
#oidtree {
order:1;
flex:none;
}
#content_window {
order:2;
flex:none;
}
#system_title_text {
overflow-x:scroll; /* TODO: at computer browser, you see a scroll bar */
}
}
 
@media only screen and (min-width: 801px) {
/* Desktop */
#system_title_menu {
display:none !important;
}
}
 
#system_title_bar {
width:100% !important;
position:relative !important;
white-space: nowrap;
}
 
body, #frames {
width:100%;
height:100%;
}
 
.wrap {
overflow-x: auto;
margin: 0 auto;
width:100%;
}
 
.gray_footer_font {
color:#808080;
font-size:0.9em;
}
 
label.padding_label {
font-weight: normal !important;
display: inline-block;
clear: left;
width: 100px;
text-align: right;
padding-top: 3px;
margin-right: 8px;
}
 
.box {
width:auto !important;
padding:20px;
background-color:#fff;
border:1px solid #ccc;
border-radius:5px;
margin-top:10px;
}
#titleedit {
width:100%;
}
#system_title_1 {
color:#2D6A9F;
margin-left:5px;
}
#system_title_2 {
color:#2B336F;
font-size:2em;
margin-left:5px;
}
 
/* Mobile menu button */
 
#bar1, #bar2, #bar3 {
width: 27px;
height: 5px;
background-color: #FFA500;
margin: 6px 0;
transition: 0.4s;
margin-left:14px;
}
 
#system_title_menu.active {
background-color: #FFA500;
}
 
.active #bar1 {
-webkit-transform: rotate(-45deg) translate(-7.5px, 7.5px);
transform: rotate(-45deg) translate(-7.5px, 7.5px);
background-color: #000;
}
 
.active #bar2 {
opacity: 0;
background-color: #000;
}
 
.active #bar3 {
-webkit-transform: rotate(45deg) translate(-8px, -8px);
transform: rotate(45deg) translate(-8px, -8px);
background-color: #000;
}
 
.hover #bar1, .hover #bar2, .hover #bar3 {
background-color:#fff;
}
 
#system_title_menu {
width:55px;
height:55px;
padding-top:8px;
text-decoration: none;
font-size: 19px;
display: none; /* will be set to 'block' by JavaScript */
background-color: #000;
float:left;
cursor: pointer;
}
 
/* Title bar */
 
#system_title_bar {
line-height:1.75em;
 
height:55px !important;
 
font-style:italic;
font-weight:bolder;
float:left;
border-bottom:1px;
 
width:100%; /* required for NoScript */
padding-left:5px;/* required for NoScript */
padding-right:5px;/* required for NoScript */
 
padding-left:0px;
margin-left:0px;
 
display:block;
 
/* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#a0d8ef+0,ddf1f9+65,feffff+100 */
background: #a0d8ef; /* Old browsers */
background: -moz-linear-gradient(left, #a0d8ef 0%, #ddf1f9 65%, #feffff 100%); /* FF3.6-15 */
background: -webkit-linear-gradient(left, #a0d8ef 0%,#ddf1f9 65%,#feffff 100%); /* Chrome10-25,Safari5.1-6 */
background: linear-gradient(to right, #a0d8ef 0%,#ddf1f9 65%,#feffff 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#a0d8ef', endColorstr='#feffff',GradientType=1 ); /* IE6-9 */
 
overflow:hidden;
}
#system_title_bar a {
text-decoration:none;
}
 
/* OID-Tree */
 
@media only screen and (max-width: 800px) {
/* Mobile */
 
#content_window {
padding-left:16px;
padding-top:0px;
}
 
}
@media only screen and (min-width: 801px) {
/* Desktop */
 
#oidtree {
position:absolute;
left:0px;
bottom:0px;
top:55px; /* required for NoScript */
width:400px; /* required for NoScript */
padding-top:5px;
white-space:nowrap; /* required for NoScript */
overflow:scroll; /* required for NoScript */
}
#content_window {
position:absolute;
left:400px;
right:0px;
bottom:0px;
top:55px; /* required for NoScript */
padding-left:20px;
padding-right:20px;
}
}
 
#oidtree {
padding-top:5px !important;
padding-left:5px;/* required for NoScript */
padding-right:5px;/* required for NoScript */
}
 
html {
margin:0;
padding:0;
height:100%;
font-family:Helvetica;
}
body {
margin:0px;
padding:0px;
font-size:0.85em;
height:100%;
/* Bootstrap adds "Helvetica Neue",Helvetica at the beginning which causes bold font in IE11+Win10 */
font-family:Arial,sans-serif !important;
}
 
@media only screen and (min-width: 801px) {
/* Desktop */
body {
overflow:hidden;
}
.borderbox {
border:1px solid silver;
}
}
 
.borderbox {
overflow:auto;
}
 
h1 {
font-size:1.8em;
}
h2 {
font-size:1.6em !important;
}
 
textarea,input[type="text"],input[type="password"],select {
/* for dark themes, this looks better */
/*background:transparent;*/
background:rgb(255,255,255,0.4);
border: #AAAAAA 1px solid;
}
 
 
input[type=button], input[type=submit], input[type=reset] {
cursor:pointer;
}
 
/**
* Splitter / uiLayout
*/
.ui-layout-pane { /* all 'panes' */
border: 1px solid #BBB;
}
.ui-layout-pane-center { /* content body */
padding: 0;
margin: 0;
}
.ui-layout-pane-west { /* west pane */
padding: 0 10px;
background-color: #f9f9f9 !important;
overflow: auto;
}
.ui-layout-resizer { /* all 'resizer-bars' */
background: #DDD;
top:55px !important; /* DM 13.03.2019 */
}
.ui-layout-resizer-open:hover { /* mouse-over */
background: #9D9;
}
.ui-layout-resizer-north {
background:#2b336f !important;
z-index:10 !important; /* DM 13.03.2019 */
}
.ui-layout-toggler { /* all 'toggler-buttons' */
background: #AAA;
}
.ui-layout-toggler-closed { /* closed toggler-button */
background: #CCC;
border-bottom: 1px solid #BBB;
}
.ui-layout-toggler .content { /* toggler-text */
font: 14px bold Verdana, Verdana, Arial, Helvetica, sans-serif;
}
.ui-layout-toggler:hover { /* mouse-over */
background: #DCA;
}
.ui-layout-toggler:hover .content { /* mouse-over */
color: #009;
}
 
/* masks are usually transparent - make them visible (must 'override' default) */
.ui-layout-mask {
background: #C00 !important;
opacity: .20 !important;
filter: alpha(opacity=20) !important;
}
 
/* Tabs */
 
#loginTab .tab-content {
color: #000;
background-color: #eeeeee;
padding : 5px 15px;
}
 
#loginTab .nav-pills > li > a {
border-radius: 0;
}
 
#loginTab .nav-pills > li.active > a {
color: #000;
font-weight: bold;
background-color: #eeeeee;
}
 
/* Goto box */
 
@media only screen and (max-width: 800px) {
/* Mobile */
 
#gotobox {
/*max-width:350px;*/
width:75%;
}
 
.mobilehidden {
display:none !important;
}
 
}
 
@media only screen and (min-width: 801px) {
/* Desktop */
 
#gotobox {
position:absolute;
right:10px;
top:10px;
width:30%;
max-width:400px;
}
 
}
 
#gotobox {
display: none; /* will be set to 'block' by JavaScript */
 
line-height:1.75em;
 
height:55px !important;
 
font-style:italic;
font-weight:bolder;
float:left;
border-bottom:1px;
 
width:100%; /* required for NoScript */
padding-left:5px;/* required for NoScript */
padding-right:5px;/* required for NoScript */
 
padding-left:0px;
margin-left:0px;
}
 
#gotobox input[type="text"] {
width:calc(100% - 45px);
}
 
#gotobox input[type="button"] {
width:40px;
}
 
Property changes:
Added: svn:mime-type
+text/css
\ No newline at end of property
/trunk/oidplus_base.js
Cannot display: file marked as a binary type.
svn:mime-type = application/javascript
Property changes:
Added: svn:mime-type
+application/javascript
\ No newline at end of property