gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-15 09:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-03-14 14:14:37 +01:00
commit c7f8c157c6
4 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
out/out.ManageNotify.php
View File

@ -36,6 +36,9 @@ if ($user->isGuest()) {
} }
if($view) { if($view) {
$view->setParam('showtree', showtree());
$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
$view->setParam('cachedir', $settings->_cacheDir); $view->setParam('cachedir', $settings->_cacheDir);
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array()); $view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());

78
views/bootstrap/class.AttributeMgr.php
View File

@ -189,7 +189,7 @@ $(document).ready( function() {
<input type="hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>" /> <input type="hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>" />
<?php <?php
} else { } else {
echo createHiddenFieldWithKey('addattrdef'); echo createHiddenFieldWithKey('addattrdef');
?> ?>
<input type="hidden" name="action" value="addattrdef"> <input type="hidden" name="action" value="addattrdef">
<?php <?php
@ -203,47 +203,49 @@ $(document).ready( function() {
'value'=>($attrdef ? htmlspecialchars($attrdef->getName()) : '') 'value'=>($attrdef ? htmlspecialchars($attrdef->getName()) : '')
) )
); );
?> $options = array();
<div class="control-group"> $options[] = array(SeedDMS_Core_AttributeDefinition::objtype_all, getMLText('all'));
<label class="control-label"> $options[] = array(SeedDMS_Core_AttributeDefinition::objtype_folder, getMLText('folder'), $attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder);
<?php printMLText("attrdef_objtype");?>: $options[] = array(SeedDMS_Core_AttributeDefinition::objtype_document, getMLText('document'), $attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document);
</label> $options[] = array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, getMLText('documentcontent'), $attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent);
<div class="controls"> $this->formField(
<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>"><?php printMLText('all'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>><?php printMLText('folder'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>><?php printMLText('document'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>><?php printMLText('documentcontent'); ?></option></select> getMLText("attrdef_objtype"),
</div> array(
</div> 'element'=>'select',
'name'=>'objtype',
'options'=>$options
<div class="control-group"> )
<label class="control-label"><?php printMLText("attrdef_type");?>:</label> );
<div class="controls"> $options = array();
<select name="type"> $options[] = getMLText('types_generic');
<optgroup label="<?= getMLText('types_generic') ?>"> $options[] = array(SeedDMS_Core_AttributeDefinition::type_int, getMLText('attrdef_type_int'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int);
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>><?php printMLText('attrdef_type_int'); ?></option> $options[] = array(SeedDMS_Core_AttributeDefinition::type_float, getMLText('attrdef_type_float'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float);
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>><?php printMLText('attrdef_type_float'); ?></option> $options[] = array(SeedDMS_Core_AttributeDefinition::type_string, getMLText('attrdef_type_string'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string);
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>><?php printMLText('attrdef_type_string'); ?></option> $options[] = array(SeedDMS_Core_AttributeDefinition::type_boolean, getMLText('attrdef_type_boolean'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean);
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>><?php printMLText('attrdef_type_boolean'); ?></option> $options[] = array(SeedDMS_Core_AttributeDefinition::type_date, getMLText('attrdef_type_date'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date);
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) echo "selected"; ?>><?php printMLText('attrdef_type_date'); ?></option> $options[] = array(SeedDMS_Core_AttributeDefinition::type_email, getMLText('attrdef_type_email'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email);
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_email ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email) echo "selected"; ?>><?php printMLText('attrdef_type_email'); ?></option> $options[] = array(SeedDMS_Core_AttributeDefinition::type_url, getMLText('attrdef_type_url'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url);
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_url ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url) echo "selected"; ?>><?php printMLText('attrdef_type_url'); ?></option> $options[] = 'SeedDMS';
</optgroup> $options[] = array(SeedDMS_Core_AttributeDefinition::type_folder, getMLText('attrdef_type_folder'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_folder);
<optgroup label="SeedDMS"> $options[] = array(SeedDMS_Core_AttributeDefinition::type_document, getMLText('attrdef_type_document'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_document);
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_folder ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_folder) echo "selected"; ?>><?php printMLText('attrdef_type_folder'); ?></option> $options[] = array(SeedDMS_Core_AttributeDefinition::type_user, getMLText('attrdef_type_user'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_user);
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_document ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_document) echo "selected"; ?>><?php printMLText('attrdef_type_document'); ?></option> $options[] = array(SeedDMS_Core_AttributeDefinition::type_group, getMLText('attrdef_type_group'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_group);
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_user ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_user) echo "selected"; ?>><?php printMLText('attrdef_type_user'); ?></option>
<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_group ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_group) echo "selected"; ?>><?php printMLText('attrdef_type_group'); ?></option>
</optgroup>
<?php
if($moreoptions = $this->callHook('additionalTypes', $attrdef)) { if($moreoptions = $this->callHook('additionalTypes', $attrdef)) {
foreach($moreoptions as $option) { foreach($moreoptions as $option) {
echo '<option value="'.(int) $option['value'].'" '.($attrdef && $attrdef->getType() == $option['value'] ? "selected" : "").'>'.$option['name'].'</option>'; if(is_string($option))
$options[] = $option;
elseif(is_array($option))
$options[] = array((int) $option['value'], $option['name'], $attrdef && $attrdef->getType() == $option['value']);
} }
} }
?> $this->formField(
</select> getMLText("attrdef_type"),
</div> array(
</div> 'element'=>'select',
<?php 'name'=>'type',
'options'=>$options
)
);
$this->formField( $this->formField(
getMLText("attrdef_multiple"), getMLText("attrdef_multiple"),
array( array(

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

@ -1135,11 +1135,15 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
echo ">"; echo ">";
if(isset($value['options']) && is_array($value['options'])) { if(isset($value['options']) && is_array($value['options'])) {
foreach($value['options'] as $val) { foreach($value['options'] as $val) {
if(is_string($val)) {
echo '<optgroup label="'.$val.'">';
} elseif(is_array($val)) {
echo '<option value="'.$val[0].'"'.(!empty($val[2]) ? ' selected' : ''); echo '<option value="'.$val[0].'"'.(!empty($val[2]) ? ' selected' : '');
if(!empty($val[3]) && is_array($val[3])) if(!empty($val[3]) && is_array($val[3]))
foreach($val[3] as $a) foreach($val[3] as $a)
echo ' '.$a[0].'="'.$a[1].'"'; echo ' '.$a[0].'="'.$a[1].'"';
echo '>'.$val[1].'</option>'; echo '>'.$val[1].'</option>';
}
} }
} }
echo '</select>'; echo '</select>';

2
views/bootstrap/class.UsrView.php
View File

@ -44,7 +44,6 @@ class SeedDMS_View_UsrView extends SeedDMS_Bootstrap_Style {
$this->pageNavigation(getMLText("my_account"), "my_account"); $this->pageNavigation(getMLText("my_account"), "my_account");
$this->contentHeading(getMLText("users")); $this->contentHeading(getMLText("users"));
$this->contentContainerStart();
echo "<table class=\"table table-condensed\">\n"; echo "<table class=\"table table-condensed\">\n";
echo "<thead>\n<tr>\n"; echo "<thead>\n<tr>\n";
@ -76,7 +75,6 @@ class SeedDMS_View_UsrView extends SeedDMS_Bootstrap_Style {
echo "</table>\n"; echo "</table>\n";
$this->contentContainerEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */