aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/mayor-portal
diff options
context:
space:
mode:
Diffstat (limited to 'mayor-orig/mayor-portal')
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-rw-r--r--mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php3
-rw-r--r--mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php4
-rw-r--r--mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php2
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css6
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/html/portal/hir.phtml27
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml24
7 files changed, 50 insertions, 18 deletions
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 1031aed8..d0fabd4c 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4538
+4554
diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php
index 5aa3bdc9..e4791c3a 100644
--- a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php
+++ b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php
@@ -41,8 +41,7 @@
$WHERE = "WHERE ".implode(' AND ',$W);
} else $WHERE = '';
- //hack
- if ($SET['all']===true) $WHERE='';
+ if ($SET['all']===true) $WHERE=' WHERE `owner`="'._USERACCOUNT.'" ';
$q = "SELECT * FROM hirek $WHERE ORDER BY kdt DESC,vdt DESC".$L;
$HIREK['szovegek'] = db_query($q, array('modul'=>'portal','result'=>'indexed'));
return $HIREK;
diff --git a/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php b/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php
index c48052fd..8e8949fc 100644
--- a/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php
+++ b/mayor-orig/mayor-portal/www/policy/parent/portal/portal/portal_demo.classic.php
@@ -31,10 +31,10 @@
echo '</td>';
echo '<td class="jobb">';
- echo '<script type="text/javascript">includeCSS(\'/skin/ajax/module-naplo/css/tanev/orarend.css\')</script>';
+ echo '<script type="text/javascript">includeCSS(\'/skin/ajax/module-naplo/css/orarend/orarend.css\')</script>';
$_refStamp = mktime(date('H')+8,0,0,date('m'), date('d'), date('Y'));
$dt = date('Y-m-d', $_refStamp);
- putDoboz('Órarend '.str_replace('-','.',$dt).'.',ajaxUpdaterForm('orarend','index.php?page=naplo&sub=tanev&f=orarend',array('dt' => $dt),'post',true)
+ putDoboz('Órarend '.str_replace('-','.',$dt).'.',ajaxUpdaterForm('orarend','index.php?page=naplo&sub=orarend&f=orarend',array('dt' => $dt),'post',true)
,array('header-color'=>'#f06'));
// putDoboz('Hangya',ajaxUpdaterForm('hangya','index.php?page=naplo&sub=hibabejelento&f=admin',array(),'post',true),
diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php
index f5931b9d..6addac83 100644
--- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php
+++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php
@@ -6,6 +6,8 @@ if (_RIGHTS_OK !== true) die();
$hirId = readVariable($_POST['hirId'],'id',null);
if ($hirId=='') $hirId = readVariable($_GET['hirId'],'id',null);
$action = readVariable($_POST['action'],'strictstring',array(null,'save',''));
+ if ($hirId>0 && isOwner($hirId)===false) $_SESSION['alert'][] = 'page:not_owner';
+
if ($action=='save' && (__HIREKADMIN || $hirId=='' || isOwner($hirId))) {
global $LANGUAGES;
if (__HIREKADMIN === true) {
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css
index 8aeb0838..6012657c 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css
@@ -1,7 +1,7 @@
div.hirCim {
- font-style: italic;
- font-size: 14px;
+ /* font-style: italic; */
+ font-size: large;
color: #000088;
font-weight: bold;
margin-top:1em;
@@ -12,7 +12,7 @@
color: #000088;
text-decoration: none;
}
- div.hirCim a:hover { color: #1E90FF }
+ div.hirCim a:hover { color: #1E90FF; text-decoration: underline; }
table.portalMain { width: 100%; }
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/portal/hir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/portal/hir.phtml
index 30be4289..38140692 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/portal/hir.phtml
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/portal/hir.phtml
@@ -1,11 +1,34 @@
<?php
function putHir($ADAT) {
- $H = $ADAT['hirek']['szovegek'][0];
+
+ $D = $H = $ADAT['hirek']['szovegek'][0];
echo '<div class="hir">';
+
+ if ($D['cim']!='') {
+ echo '<div class="hirCim">';
+ if ($D['class']==6) {
+ echo '<span title="Védett hír" class="icon-lock-alt" style="padding-right:4px;"></span>';
+ }
+ echo '</div>';
+ }
echo '<h1>'.$H['cim'].'</h1>';
echo '<p>'.$H['txt'].'</p>';
- //echo '<div>'.$H['kdt'].'</div>';
+
+ echo '<div class="egyHirmeta" style="color:#aaa; padding:0px 2px 6px 0px; font-size:x-small;">';
+ echo superdate($D['kdt']);
+ echo ' · ';
+ echo $D['owner'];
+ if ($D['csoport']!='') {
+ $CSOPORT = explode(',',$D['csoport']);
+ echo ' · ';
+ //echo '<span style="margin-top:10px">';
+ for ($j=0; $j<count($CSOPORT); $j++) echo '<span class="tag">'.$CSOPORT[$j].'</span>';
+ //echo '</span>';
+ }
+
+ echo '</div>';
+
echo '</div>';
if (_OG_ENABLED===true) {
echo '<div class="fb-comments" style="z-index:0" data-href="'._BASE_URL.'/index.php?page=portal&amp;sub=portal&amp;f=hir&amp;hirId='.$H['id'].'"
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml
index 115876b4..37812ac0 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml
@@ -16,13 +16,27 @@
list ($a,$b) = explode('<!-- more -->',$D['txt']);
echo '<div class="egyHir '.$_class.'">';
- echo '<div class="hirCim">';
+ if ($D['cim']!='') {
+ echo '<div class="hirCim">';
if ($D['class']==6) {
echo '<span title="Védett hír" class="icon-lock-alt" style="padding-right:4px;"></span>';
}
echo '<a href="'.href('index.php?page=portal&sub=portal&f=hir&hirId='.$D['id']).'">'.$D['cim'].'</a>';
+ echo '</div>';
+ echo '<div class="egyHirmeta" style="color:#aaa; padding:0px 2px 6px 0px; font-size:x-small;">';
+ echo superdate($D['kdt']);
+ echo ' · ';
+ echo $D['owner'];
+ if ($D['csoport']!='') {
+ $CSOPORT = explode(',',$D['csoport']);
+ echo ' · ';
+ //echo '<span style="margin-top:10px">';
+ for ($j=0; $j<count($CSOPORT); $j++) echo '<span class="tag">'.$CSOPORT[$j].'</span>';
+ //echo '</span>';
+ }
- echo '</div>';
+ echo '</div>';
+ }
echo '<div class="hir">';
echo $a;
if ($b!="") echo ' <a href="'.href('index.php?page=portal&sub=portal&f=hir&hirId='.$D['id']).'">Tovább...</a>';
@@ -33,12 +47,6 @@
echo '</a>';
}
- if ($D['csoport']!='') {
- $CSOPORT = explode(',',$D['csoport']);
- echo '<div style="margin-top:10px">';
- for ($j=0; $j<count($CSOPORT); $j++) echo '<span class="tag">'.$CSOPORT[$j].'</span>';
- echo '</div>';
- }
echo '<div style="display:none; font-size:10px; padding:2px; text-align:right; color:#aaa">'.($ADAT['hirek']['szovegek'][0]['kdt']).'</div>';
echo '<hr style="clear:both; height:0px; margin-top:2em; margin-bottom:2em; width:80%; background-color: #777777; border-style: solid; border-color: #eeeeee; border-width: 0px 0px 1px 0px;" />';
echo '</div>';