gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.9' into develop

Browse Source 
Conflicts:
	views/bootstrap/class.Bootstrap.php
This commit is contained in:
Uwe Steinmann 2014-07-23 06:55:44 +02:00
commit cbe0574388
4 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SeedDMS_Core/package.xml
View File

@ -12,7 +12,7 @@
<email>uwe@steinmann.cx</email> <email>uwe@steinmann.cx</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2014-05-22</date> <date>2014-07-23</date>
<time>09:03:59</time> <time>09:03:59</time>
<version> <version>
<release>4.3.9</release> <release>4.3.9</release>

4
SeedDMS_Lucene/package.xml
View File

@ -11,8 +11,8 @@
<email>uwe@steinmann.cx</email> <email>uwe@steinmann.cx</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2013-08-13</date> <date>2014-07-23</date>
<time>21:56:55</time> <time>18:00:34</time>
<version> <version>
<release>1.1.5</release> <release>1.1.5</release>
<api>1.1.5</api> <api>1.1.5</api>

1
views/bootstrap/class.AddFile.php
View File

@ -87,7 +87,6 @@ function checkForm()
</div> </div>
<?php <?php
$this->contentContainerStart(); $this->contentContainerStart();
// $this->addFooterJS("$('#fileupload').fileupload();");
?> ?>
<form action="../op/op.AddFile.php" enctype="multipart/form-data" method="post" name="form1" id="fileupload" onsubmit="return checkForm();"> <form action="../op/op.AddFile.php" enctype="multipart/form-data" method="post" name="form1" id="fileupload" onsubmit="return checkForm();">

25
views/bootstrap/class.Bootstrap.php
View File

@ -65,26 +65,6 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/themes/default.js"></script>'."\n"; echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/themes/default.js"></script>'."\n";
echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jqtree/tree.jquery.js"></script>'."\n"; echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jqtree/tree.jquery.js"></script>'."\n";
echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n"; echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n";
/*
echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.js"></script>'."\n";
echo '<script type="text/javascript" src="../styles/'.$this->theme.'/fileupload/jquery.iframe-transport.js"></script>'."\n";
echo '<script type="text/javascript" src="../styles/'.$this->theme.'/fileupload/jquery.fileupload.js"></script>'."\n";
echo "
<script>
$(function () {
$('#fileupload').fileupload({
dataType: 'json',
done: function (e, data) {
$.each(data.result.files, function (index, file) {
$('<p/>').text(file.name).appendTo(document.body);
});
}
});
});
</script>
";
*/
echo '<link rel="shortcut icon" href="../styles/'.$this->theme.'/favicon.ico" type="image/x-icon"/>'."\n"; echo '<link rel="shortcut icon" href="../styles/'.$this->theme.'/favicon.ico" type="image/x-icon"/>'."\n";
if($this->params['session'] && $this->params['session']->getSu()) { if($this->params['session'] && $this->params['session']->getSu()) {
?> ?>
@ -822,11 +802,6 @@ $(document).ready(function () {
</div> </div>
</div> </div>
<?php <?php
/*
<script>
$('#<?php echo $varname; ?>').fileupload();
</script>
*/
} /* }}} */ } /* }}} */
function printDateChooser($defDate = -1, $varName) { /* {{{ */ function printDateChooser($defDate = -1, $varName) { /* {{{ */