little code improvements to make it clearer

Admidio · Nov 7, 2016 · fb4330a · fb4330a
1 parent 16bb799
commit fb4330a
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 113 deletions.
diff --git a/adm_program/installation/layout/admidio.css b/adm_program/installation/layout/admidio.css
@@ -442,7 +442,7 @@ input[data-provide="datepicker"], input[type="number"], input[type="time"] {
 
 /* Information block with user and timestamp who created and edited the data */
 
-.admidio-admidio-info-created-edited {
+.admidio-info-created-edited {
     font-size: 8pt;
     margin-top: 8px;
 }

diff --git a/adm_program/modules/announcements/announcements.php b/adm_program/modules/announcements/announcements.php
@@ -159,13 +159,18 @@
 
             <div class="panel-body">'.
                 $announcement->getValue('ann_description').
-
             '</div>
             <div class="panel-footer">'.
                 // show information about user who creates the recordset and changed it
-                admFuncShowCreateChangeInfoByName($row['create_name'], $announcement->getValue('ann_timestamp_create'),
-                    $row['change_name'], $announcement->getValue('ann_timestamp_change'), $announcement->getValue('ann_usr_id_create'), $announcement->getValue('ann_usr_id_change')).'
-                ' . $gL10n->get('SYS_CATEGORY') . ' <a href="'.ADMIDIO_URL.FOLDER_MODULES.'/announcements/announcements.php?headline='. $getHeadline.'&amp;cat_id'.$announcement->getValue('ann_cat_id').'">' . $announcement->getValue('cat_name').'</a>
+                admFuncShowCreateChangeInfoByName(
+                    $row['create_name'], $announcement->getValue('ann_timestamp_create'),
+                    $row['change_name'], $announcement->getValue('ann_timestamp_change'),
+                    $announcement->getValue('ann_usr_id_create'), $announcement->getValue('ann_usr_id_change')
+                ) .
+                '<div class="admidio-info-category">' .
+                    $gL10n->get('SYS_CATEGORY') .
+                    ' <a href="'.ADMIDIO_URL.FOLDER_MODULES.'/announcements/announcements.php?headline='. $getHeadline.'&amp;cat_id'.$announcement->getValue('ann_cat_id').'">' . $announcement->getValue('cat_name').'</a>
+                </div>
             </div>
         </div>');
     }  // Ende foreach

diff --git a/adm_program/modules/announcements/announcements_new.php b/adm_program/modules/announcements/announcements_new.php
@@ -106,7 +106,10 @@
 }
 $form->addEditor('ann_description', $gL10n->get('SYS_TEXT'), $announcement->getValue('ann_description'), array('property' => FIELD_REQUIRED, 'height' => '400'));
 $form->addSubmitButton('btn_save', $gL10n->get('SYS_SAVE'), array('icon' => THEME_URL.'/icons/disk.png'));
-$form->addHtml(admFuncShowCreateChangeInfoById($announcement->getValue('ann_usr_id_create'), $announcement->getValue('ann_timestamp_create'), $announcement->getValue('ann_usr_id_change'), $announcement->getValue('ann_timestamp_change')));
+$form->addHtml(admFuncShowCreateChangeInfoById(
+    $announcement->getValue('ann_usr_id_create'), $announcement->getValue('ann_timestamp_create'),
+    $announcement->getValue('ann_usr_id_change'), $announcement->getValue('ann_timestamp_change')
+));
 
 // add form to html page and show page
 $page->addHtml($form->show(false));