take out patches accidentially taken over from demo

This commit is contained in:
Uwe Steinmann 2019-05-07 08:05:19 +02:00
parent 5734d9808e
commit f8ac8aa74f
5 changed files with 3 additions and 78 deletions

View File

@ -1,5 +1,5 @@
VERSION=$(shell php -r 'include("inc/inc.Version.php"); $$v=new SeedDMS_Version(); echo $$v->version();')
SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer .htaccess
SRC=CHANGELOG inc conf utils index.php .htaccess languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
# webapp
NODISTFILES=utils/importmail.php utils/seedddms-importmail utils/remote-email-upload utils/remote-upload utils/da-bv-reminder.php utils/seeddms-da-bv-reminder .svn .gitignore styles/blue styles/hc styles/clean views/blue views/hc views/clean views/pca

View File

@ -45,8 +45,6 @@ else $currenttab=NULL;
// add new attribute definition ---------------------------------------------
if ($action == "download") {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
if (!isset($_POST["extname"])) {
UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
}

View File

@ -228,21 +228,6 @@ ul.qq-upload-list li span {
display: none;
}
#splashScreen img{
margin:0 auto;
}
#splashScreen{
position:absolute;
top:0px;
left:0;
height:100%;
width:100%;
background: url(../img/kachel.png);
background-repeat:no-repeat;
text-align:center;
}
@media (min-width: 1200px) {
.modal-wide {
width: 800px;

View File

@ -219,8 +219,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
function footNote() { /* {{{ */
echo "<div class=\"container-fluid\">\n";
echo '<div class="row-fluid" style="padding-top: 20px;">'."\n";
echo '<div class="span6">'."\n";
echo '<div class="row-fluid">'."\n";
echo '<div class="span12">'."\n";
echo '<div class="alert alert-info">'."\n";
if ($this->params['printdisclaimer']){
echo "<div class=\"disclaimer\">".getMLText("disclaimer")."</div>";
@ -229,23 +229,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
if (isset($this->params['footnote']) && strlen((string)$this->params['footnote'])>0) {
echo "<div class=\"footNote\">".(string)$this->params['footnote']."</div>";
}
echo "</div>\n";
echo "</div>\n";
echo '<div class="span6">'."\n";
echo '<div class="alert alert-error">'."\n";
?>
Please help to improve SeedDMS! All donations are spend on developing SeedDMS. Donate at least 20 USD and get a pdf copy of the user's manual including updates for 1 year.
<form style="display: inline-block; margin: 0px 0px 14px;" action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_donations">
<input type="hidden" name="business" value="uwe@steinmann.cx">
<input type="hidden" name="lc" value="US">
<input type="hidden" name="item_name" value="Support development of SeedDMS">
<input type="hidden" name="no_note" value="30">
<input type="hidden" name="currency_code" value="USD">
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
<?php
echo "</div>\n";
echo "</div>\n";
echo "</div>\n";
@ -370,18 +353,6 @@ Please help to improve SeedDMS! All donations are spend on developing SeedDMS. D
echo " <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=23\"></div>";
echo " </div>";
}
echo '<ul class="nav pull-right"><li>
<form style="display: inline-block; padding: 7px 0px 0px 0px; margin: 0px 0px 6px;" action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_donations">
<input type="hidden" name="business" value="uwe@steinmann.cx">
<input type="hidden" name="lc" value="US">
<input type="hidden" name="item_name" value="Support development of SeedDMS">
<input type="hidden" name="no_note" value="30">
<input type="hidden" name="currency_code" value="USD">
<input type="image" target="paypal" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
</li></ul>';
echo " <ul class=\"nav\">\n";
// echo " <li id=\"first\"><a href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".getMLText("content")."</a></li>\n";

View File

@ -246,8 +246,6 @@ $('#loadmore').click(function(e) {
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/splashscreen/jquery.splashscreen.js"></script>'."\n", 'js');
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/splashscreen/splashscreen.js"></script>'."\n", 'js');
echo $this->callHook('startPage');
$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
@ -265,33 +263,6 @@ $('#loadmore').click(function(e) {
echo $this->callHook('preContent');
?>
<div style="display: none;" class="splashscreen" data-top="222" data-height="70" data-left="54" data-width="296" data-img="../views/bootstrap/images/empty.png" data-link="index.php?id=236" data-target="body">
<div style="color: #444;">
<h2>Please support SeedDMS development</h2>
<p style="margin-bottom: 20px;">
Before you continue, think about supporting SeedDMS. Running this demo,
steadily developing the software, and giving support takes time and money. If you feel
like SeedDMS makes your live easier, then please help us to keep up the work.
<p>
<p style="margin-bottom: 20px;">
You may also contact us for a personalized demo, exclusively used by yourself
and setup to fit your needs. Contact us at <a href="mailto:info@seeddms.org">info@seeddms.org</a>.
<p>
<form style="display: inline-block;" action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
<input type="hidden" name="cmd" value="_donations">
<input type="hidden" name="business" value="uwe@steinmann.cx">
<input type="hidden" name="lc" value="US">
<input type="hidden" name="item_name" value="Support development of SeedDMS">
<input type="hidden" name="no_note" value="0">
<input type="hidden" name="amount" value="30">
<input type="hidden" name="currency_code" value="USD">
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
</div>
</div>
<?php
echo "<div class=\"row-fluid\">\n";
// dynamic columns - left column removed if no content and right column then fills span12.