gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-08 20:46:05 +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 2023-02-22 10:11:37 +01:00
commit cb1cb46cfe
7 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -254,6 +254,7 @@
- conversion from pdf to png replaces alpha channel with white - conversion from pdf to png replaces alpha channel with white
- add list of conversion services in debug menu of admin tool - add list of conversion services in debug menu of admin tool
- use chosen select for custom attributes - use chosen select for custom attributes
- color category (use first 6 chars of md5(category name) as hex color)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.29 Changes in version 5.1.29

8
inc/inc.ClassViewCommon.php
View File

@ -357,4 +357,12 @@ class SeedDMS_View_Common {
} }
echo "};\n"; echo "};\n";
} /* }}} */ } /* }}} */
public static function getContrastColor($hexcolor) { /* {{{ */
$r = hexdec(substr($hexcolor, 1, 2));
$g = hexdec(substr($hexcolor, 3, 2));
$b = hexdec(substr($hexcolor, 5, 2));
$yiq = (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
return ($yiq >= 148) ? '000000' : 'ffffff';
} /* }}} */
} }

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

@ -3291,8 +3291,10 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
} }
if($categories = $document->getCategories()) { if($categories = $document->getCategories()) {
$content .= "<br />"; $content .= "<br />";
foreach($categories as $category) foreach($categories as $category) {
$content .= "<span class=\"badge bg-secondary\">".$category->getName()."</span> "; $color = substr(md5($category->getName()), 0, 6);
$content .= "<span class=\"badge\" style=\"background-color: #".$color."; color: #".self::getContrastColor($color).";\">".$category->getName()."</span> ";
}
} }
if(!empty($extracontent['bottom_title'])) if(!empty($extracontent['bottom_title']))
$content .= $extracontent['bottom_title']; $content .= $extracontent['bottom_title'];

3
views/bootstrap/class.Categories.php
View File

@ -150,7 +150,8 @@ $(document).ready( function() {
$options[] = array("-1", getMLText("choose_category")); $options[] = array("-1", getMLText("choose_category"));
$options[] = array("0", getMLText("new_document_category")); $options[] = array("0", getMLText("new_document_category"));
foreach ($categories as $category) { foreach ($categories as $category) {
$options[] = array($category->getID(), htmlspecialchars($category->getName()), $selcat && $category->getID()==$selcat->getID(), array(array('data-subtitle', $category->countDocumentsByCategory().' '.getMLText('documents')))); $color = substr(md5($category->getName()), 0, 6);
$options[] = array($category->getID(), htmlspecialchars($category->getName()), $selcat && $category->getID()==$selcat->getID(), array(array('data-before-title', "<i class='fa fa-circle' style='color: #".$color.";'></i> "), array('data-subtitle', $category->countDocumentsByCategory().' '.getMLText('documents'))));
} }
$this->formField( $this->formField(
null, //getMLText("selection"), null, //getMLText("selection"),

2
views/bootstrap/styles/application.js
View File

@ -12,6 +12,8 @@ chzn_template_func = function (state) {
if($(state.element).data('warning')) if($(state.element).data('warning'))
warning = $(state.element).data('warning')+''; /* make sure it is a string */ warning = $(state.element).data('warning')+''; /* make sure it is a string */
var html = '<span>'; var html = '<span>';
if($(state.element).data('before-title'))
html += $(state.element).data('before-title')+'';
if($(state.element).data('icon-before')) if($(state.element).data('icon-before'))
html += '<i class="fa fa-'+$(state.element).data('icon-before')+'"></i> '; html += '<i class="fa fa-'+$(state.element).data('icon-before')+'"></i> ';
html += state.text.replace(/</g, '&lt;')+''; html += state.text.replace(/</g, '&lt;')+'';

6
views/bootstrap4/class.Bootstrap4.php
View File

@ -3287,8 +3287,10 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
} }
if($categories = $document->getCategories()) { if($categories = $document->getCategories()) {
$content .= "<br />"; $content .= "<br />";
foreach($categories as $category) foreach($categories as $category) {
$content .= "<span class=\"badge bg-secondary\">".$category->getName()."</span> "; $color = substr(md5($category->getName()), 0, 6);
$content .= "<span class=\"badge\" style=\"background-color: #".$color."; color: #".self::getContrastColor($color).";\">".$category->getName()."</span> ";
}
} }
if(!empty($extracontent['bottom_title'])) if(!empty($extracontent['bottom_title']))
$content .= $extracontent['bottom_title']; $content .= $extracontent['bottom_title'];

2
views/bootstrap4/styles/application.js
View File

@ -12,6 +12,8 @@ chzn_template_func = function (state) {
if($(state.element).data('warning')) if($(state.element).data('warning'))
warning = $(state.element).data('warning')+''; /* make sure it is a string */ warning = $(state.element).data('warning')+''; /* make sure it is a string */
var html = '<span>'; var html = '<span>';
if($(state.element).data('before-title'))
html += $(state.element).data('before-title')+'';
if($(state.element).data('icon-before')) if($(state.element).data('icon-before'))
html += '<i class="fa fa-'+$(state.element).data('icon-before')+'"></i> '; html += '<i class="fa fa-'+$(state.element).data('icon-before')+'"></i> ';
html += state.text.replace(/</g, '&lt;')+''; html += state.text.replace(/</g, '&lt;')+'';