remove some white space

This commit is contained in:
Uwe Steinmann 2017-01-01 14:46:25 +01:00
parent 3242714fda
commit 9e0ca7cb5f

View File

@ -79,7 +79,7 @@ class UI_Default {
function footNote() { /* {{{ */
global $settings;
echo "<div class=\"container-fluid\" style=\"margin-top: 0px;\">\n";
echo '<div class="row-fluid">'."\n";
echo '<div class="span12">'."\n";
@ -95,7 +95,7 @@ class UI_Default {
echo "</div>\n";
echo "</div>\n";
echo "</div>\n";
return;
} /* }}} */
@ -124,7 +124,7 @@ class UI_Default {
} /* }}} */
function __globalNavigation($folder=null) { /* {{{ */
global $settings, $user;
echo "<div class=\"globalBox\">\n";
@ -203,7 +203,7 @@ class UI_Default {
} /* }}} */
function __folderNavigationBar($folder) { /* {{{ */
global $user, $settings, $theme;
if (!is_object($folder) || strcasecmp(get_class($folder), "SeedDMS_Core_Folder")) {
@ -237,7 +237,7 @@ class UI_Default {
} /* }}} */
function __documentNavigationBar() { /* {{{ */
global $user, $settings, $document;
$accessMode = $document->getAccessMode($user);
@ -274,13 +274,13 @@ class UI_Default {
} /* }}} */
function __accountNavigationBar() { /* {{{ */
global $settings,$user;
echo "<ul class=\"localNav\">\n";
if (!$settings->_disableSelfEdit) echo "<li id=\"first\"><a href=\"../out/out.EditUserData.php\">".getMLText("edit_user_details")."</a></li>\n";
if (!$user->isAdmin())
if (!$user->isAdmin())
echo "<li><a href=\"../out/out.UserDefaultKeywords.php\">".getMLText("edit_default_keywords")."</a></li>\n";
echo "<li><a href=\"../out/out.ManageNotify.php\">".getMLText("edit_existing_notify")."</a></li>\n";
@ -288,7 +288,7 @@ class UI_Default {
if ($settings->_enableUsersView){
echo "<li><a href=\"../out/out.UsrView.php\">".getMLText("users")."</a></li>\n";
echo "<li><a href=\"../out/out.GroupView.php\">".getMLText("groups")."</a></li>\n";
}
}
echo "</ul>\n";
return;
} /* }}} */
@ -305,7 +305,7 @@ class UI_Default {
} /* }}} */
function __adminToolsNavigationBar() { /* {{{ */
global $settings;
echo "<ul class=\"localNav\">\n";
@ -318,13 +318,13 @@ class UI_Default {
echo "</ul>\n";
return;
} /* }}} */
function __calendarNavigationBar($d){ /* {{{ */
global $settings,$user;
$ds="&day=".$d[0]."&month=".$d[1]."&year=".$d[2];
echo "<ul class=\"localNav\">\n";
echo "<li><a href=\"../out/out.Calendar.php?mode=w".$ds."\">".getMLText("week_view")."</a></li>\n";
echo "<li><a href=\"../out/out.Calendar.php?mode=m".$ds."\">".getMLText("month_view")."</a></li>\n";
@ -332,7 +332,7 @@ class UI_Default {
if (!$user->isGuest()) echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
echo "</ul>\n";
return;
} /* }}} */
function __pageList($pageNumber, $totalPages, $baseURI, $params) { /* {{{ */
@ -359,7 +359,7 @@ class UI_Default {
}
}
else {
$resultsURI .= ($first ? "?" : "&").$key."=".$value;
$resultsURI .= ($first ? "?" : "&").$key."=".$value;
}
$first = false;
}
@ -496,7 +496,7 @@ class UI_Default {
} /* }}} */
function __printDateChooser($defDate = -1, $varName) { /* {{{ */
if ($defDate == -1)
$defDate = mktime();
$day = date("d", $defDate);
@ -521,7 +521,7 @@ class UI_Default {
print ">" . $i . "</option>\n";
}
print "</select> \n";
print "<select name=\"" . $varName . "year\">\n";
print "<select name=\"" . $varName . "year\">\n";
for ($i = $year-5 ; $i <= $year+5 ; $i++)
{
print "<option value=\"" . $i . "\"";
@ -557,7 +557,7 @@ class UI_Default {
}
print "</select>";
} /* }}} */
function __printDocumentChooser($formName) { /* {{{ */
global $settings;
?>
@ -657,46 +657,46 @@ class UI_Default {
} /* }}} */
static function exitError($pagetitle,$error) { /* {{{ */
UI::htmlStartPage($pagetitle);
UI::globalNavigation();
print "<div class=\"error\">";
print htmlspecialchars($error);
print "</div>";
UI::htmlEndPage();
add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle);
exit;
exit;
} /* }}} */
// navigation flag is used for items links (navigation or selection)
function __printFoldersTree($accessMode, $exclude, $folderID, $currentFolderID=-1, $navigation=false) { /* {{{ */
global $dms, $user, $form, $settings;
if ($settings->_expandFolderTree==2){
// folder completely open
$is_open=true;
}else if ($settings->_expandFolderTree==1 && $folderID==$settings->_rootFolderID ){
$is_open=true;
}else{
// open the tree until the current folder
$is_open=false;
if ($currentFolderID!=-1){
$currentFolder=$dms->getFolder($currentFolderID);
if (is_object($currentFolder)){
$parent=$currentFolder->getParent();
while (is_object($parent)){
if ($parent->getID()==$folderID){
$is_open=true;
@ -707,25 +707,25 @@ class UI_Default {
}
}
}
$folder = $dms->getFolder($folderID);
if (!is_object($folder)) return;
$subFolders = $folder->getSubFolders();
$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ);
if ($folderID == $settings->_rootFolderID) print "<ul style='list-style-type: none;' class='tree'>\n";
print "<li>\n";
if (count($subFolders) > 0){
print "<a href=\"javascript:toggleTree(".$folderID.")\"><img class='treeicon' name=\"treedot".$folderID."\" src=\"";
print "<a href=\"javascript:toggleTree(".$folderID.")\"><img class='treeicon' name=\"treedot".$folderID."\" src=\"";
if ($is_open) UI::printImgPath("minus.png");
else UI::printImgPath("plus.png");
print "\" border=0></a>\n";
}
else{
print "<img class='treeicon' src=\"";
print "<img class='treeicon' src=\"";
UI::printImgPath("blank.png");
print "\" border=0>\n";
}
@ -733,12 +733,12 @@ class UI_Default {
if ($folder->getAccessMode($user) >= $accessMode) {
if ($folderID != $currentFolderID){
if ($navigation) print "<a href=\"../out/out.ViewFolder.php?folderid=" . $folderID . "&showtree=1\">";
else print "<a class=\"foldertree_selectable\" href=\"javascript:folderSelected(" . $folderID . ", '" . str_replace("'", "\\'", htmlspecialchars($folder->getName())) . "')\">";
}else print "<span class=\"selectedfoldertree\">";
if ($is_open) print "<img src=\"".UI::getImgPath("folder_opened.gif")."\" border=0 name=\"treeimg".$folderID."\">".htmlspecialchars($folder->getName());
else print "<img src=\"".UI::getImgPath("folder_closed.gif")."\" border=0 name=\"treeimg".$folderID."\">".htmlspecialchars($folder->getName());
@ -750,22 +750,22 @@ class UI_Default {
if ($is_open) print "<ul style='list-style-type: none;' id=\"tree".$folderID."\" >\n";
else print "<ul style='list-style-type: none; display: none;' id=\"tree".$folderID."\" >\n";
for ($i = 0; $i < count($subFolders); $i++) {
if ($subFolders[$i]->getID() == $exclude) continue;
UI::printFoldersTree( $accessMode, $exclude, $subFolders[$i]->getID(),$currentFolderID,$navigation);
}
print "</ul>\n";
if ($folderID == $settings->_rootFolderID) print "</ul>\n";
} /* }}} */
function __printTreeNavigation($folderid,$showtree){ /* {{{ */
global $settings;
?>
<script language="JavaScript">
function toggleTree(id){
@ -798,9 +798,9 @@ class UI_Default {
UI::contentContainerEnd();
}else{
print "<td id='tree-closed'>";
print "<td id='tree-closed'>";
UI::contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><img src=\"".UI::getImgPath("p.png")."\" border=0></a>", true);
UI::contentContainerStart();
UI::contentContainerEnd();