Skip to content

Commit

Permalink
jQuery Migrate 1.1.1, Issue #19
Browse files Browse the repository at this point in the history
  • Loading branch information
@slackero
slackero committed Feb 19, 2013
1 parent 1a4c36f commit c4615cb
Show file tree
Hide file tree
Showing 13 changed files with 107 additions and 67 deletions.
22 changes: 21 additions & 1 deletion config/phpwcms/conf.template_default.inc.php
View file
Expand Up @@ -326,7 +326,27 @@
'navlist-asub_last' => 'asub_last',
'navlist-navLevel' => 'navLevel-',
'breadcrumb-active' => 'active',
'cp-anchor' => 'cpidClass'
'cp-anchor' => 'cpidClass',
'image-thumb' => 'image-thumb',
'image-wrapper' => 'image-wrapper',
'image-link' => 'image-link',
'image-zoom' => 'image-zoom',
'image-lightbox' => 'image-lightbox',
'imgtxt-top-left' => 'imgtxt-top-left',
'imgtxt-top-center' => 'imgtxt-top-center',
'imgtxt-top-right' => 'imgtxt-top-right',
'imgtxt-bottom-left' => 'imgtxt-bottom-left',
'imgtxt-bottom-center' => 'imgtxt-bottom-center',
'imgtxt-bottom-right' => 'imgtxt-bottom-right',
'imgtxt-left' => 'imgtxt-left',
'imgtxt-right' => 'imgtxt-right',
'imgtxt-column-left' => 'imgtxt-column-left',
'imgtxt-column-right' => 'imgtxt-column-right',
'copyright' => 'copyright',
'image-list-table' => 'image-list-table-',
'link-article-listing' => 'article-listing',
'link-print' => 'print',
'link-print-pdf' => 'print-pdf'
);


Expand Down
13 changes: 7 additions & 6 deletions include/inc_front/content.article.inc.php
View file
Expand Up @@ -215,7 +215,8 @@
if($thumb_image != false) {

$thumb_img = '<img src="'.PHPWCMS_IMAGES . $thumb_image[0] .'" border="0" '.$thumb_image[3];
$thumb_img .= ' alt="'.html_specialchars($caption[1]).'" title="'.html_specialchars($caption[3]).'" />';
$thumb_img .= ' alt="'.html_specialchars($caption[1]).'" title="'.html_specialchars($caption[3]).'"';
$thumb_img .= ' class="'.$template_default['classes']['image-thumb'].'" />';

$img_thumb_name = $thumb_image[0];
$img_thumb_rel = PHPWCMS_IMAGES.$thumb_image[0];
Expand Down Expand Up @@ -259,7 +260,7 @@
if(!empty($caption[2][1])) {
$thumb_href .= $caption[2][1];
}
$thumb_href .= '>';
$thumb_href .= ' class="'.$template_default['classes']['image-zoom'].'">';
} else {

//lightbox
Expand All @@ -269,7 +270,7 @@
if($row["article_image"]["caption"]) {
$thumb_href .= ' title="'.parseLightboxCaption($row["article_image"]["caption"]).'"';
}
$thumb_href .= ' rel="lightbox" target="_blank">';
$thumb_href .= ' rel="lightbox" class="'.$template_default['classes']['image-lightbox'].'">';
}

$thumb_img = $thumb_href.$thumb_img.'</a>';
Expand All @@ -279,7 +280,7 @@
} else {

if($caption[2][0]) {
$thumb_img = '<a href="'.$caption[2][0].'"'.$caption[2][1].'>'.$thumb_img.'</a>';
$thumb_img = '<a href="'.$caption[2][0].'"'.$caption[2][1].' class="'.$template_default['classes']['image-link'].'">'.$thumb_img.'</a>';
}
}
}
Expand Down Expand Up @@ -492,7 +493,7 @@
// Space before
if($crow["acontent_before"]) {
if(!empty($template_default["article"]["div_spacer"])) {
$CNT_TMP .= '<div style="margin:'.$crow["acontent_before"].'px 0 0 0;padding:0;" class="'.$template_default['classes']['spaceholder-cp-before'].'"></div>';
$CNT_TMP .= '<div style="margin-top:'.$crow["acontent_before"].'px;" class="'.$template_default['classes']['spaceholder-cp-before'].'"></div>';
} else {
$CNT_TMP .= '<br class="'.$template_default['classes']['spaceholder-cp-before'].'" />'.spacer(1,$crow["acontent_before"]);
}
Expand Down Expand Up @@ -524,7 +525,7 @@
// Space after
if($crow["acontent_after"]) {
if(!empty($template_default["article"]["div_spacer"])) {
$CNT_TMP .= '<div style="margin:0 0 '.$crow["acontent_after"].'px 0;padding:0;" class="'.$template_default['classes']['spaceholder-cp-after'].'"></div>';
$CNT_TMP .= '<div style="margin-bottom:'.$crow["acontent_after"].'px;" class="'.$template_default['classes']['spaceholder-cp-after'].'"></div>';
} else {
$CNT_TMP .= '<br class="'.$template_default['classes']['spaceholder-cp-after'].'" />'.spacer(1,$crow["acontent_after"]);
}
Expand Down
4 changes: 2 additions & 2 deletions include/inc_front/content.func.inc.php
View file
Expand Up @@ -828,11 +828,11 @@

// replace Print URL
if(strpos($content["all"], '[PRINT]') !== false) {
$content["all"] = str_replace('[PRINT]', '<a href="'.rel_url(array('print'=>1),array(), PHPWCMS_ALIAS).'" target="_blank" rel="nofollow">', $content["all"]);
$content["all"] = str_replace('[PRINT]', '<a href="'.rel_url(array('print'=>1),array(), PHPWCMS_ALIAS).'" class="'.$template_default['classes']['link-print'].'" target="_blank" rel="nofollow">', $content["all"]);
$content["all"] = str_replace('[/PRINT]', '</a>', $content["all"]);
}
if(strpos($content["all"], '[PRINT_PDF]') !== false) {
$content["all"] = str_replace('[PRINT_PDF]', '<a href="'.rel_url(array('print'=>2),array(), PHPWCMS_ALIAS).'" target="_blank" rel="nofollow">', $content["all"]);
$content["all"] = str_replace('[PRINT_PDF]', '<a href="'.rel_url(array('print'=>2),array(), PHPWCMS_ALIAS).'" class="'.$template_default['classes']['link-print-pdf'].'" target="_blank" rel="nofollow">', $content["all"]);
$content["all"] = str_replace('[/PRINT_PDF]', '</a>', $content["all"]);
}

Expand Down
22 changes: 11 additions & 11 deletions include/inc_front/content/cnt1.article.inc.php
View file
Expand Up @@ -43,19 +43,19 @@

// 0 :1 :2 :3 :4 :5 :6 :7 :8
// dbid:filename:hash:extension:width:height:caption:position:zoom
$image = ($crow["acontent_image"]) ? explode(":", $crow["acontent_image"]) : false ;
$image = ($crow["acontent_image"]) ? explode(":", $crow["acontent_image"]) : false ;

$crow["default_settings"] = array(
'class_top_left' => 'imgtxt-top-left',
'class_top_center' => 'imgtxt-top-center',
'class_top_right' => 'imgtxt-top-right',
'class_bottom_left' => 'imgtxt-bottom-left',
'class_bottom_center' => 'imgtxt-bottom-center',
'class_bottom_right' => 'imgtxt-bottom-right',
'class_float_left' => 'imgtxt-left',
'class_float_right' => 'imgtxt-right',
'class_column_left' => 'imgtxt-column-left',
'class_column_right' => 'imgtxt-column-right',
'class_top_left' => $template_default['classes']['imgtxt-top-left'],
'class_top_center' => $template_default['classes']['imgtxt-top-center'],
'class_top_right' => $template_default['classes']['imgtxt-top-right'],
'class_bottom_left' => $template_default['classes']['imgtxt-bottom-left'],
'class_bottom_center' => $template_default['classes']['imgtxt-bottom-center'],
'class_bottom_right' => $template_default['classes']['imgtxt-bottom-right'],
'class_float_left' => $template_default['classes']['imgtxt-left'],
'class_float_right' => $template_default['classes']['imgtxt-right'],
'class_column_left' => $template_default['classes']['imgtxt-column-left'],
'class_column_right' => $template_default['classes']['imgtxt-column-right'],
'width' => $image[4],
'height' => $image[5],
'zoom' => $image[8],
Expand Down
8 changes: 4 additions & 4 deletions include/inc_front/content/cnt22.article.inc.php
View file
Expand Up @@ -36,10 +36,10 @@
}
if(!$rssfeed['template']) {

$rssfeed['template'] = '<!--ITEM_START//--><p><a href="{LINK}" target="_blank">{TITLE}</a></p><!--ITEM_END//-->
<!--DIVIDER_START//--><div style="padding:0;margin:0;border-top:1px dotted #B2B2B2;height:1px;overflow:hidden;"><img src="img/leer.gif" width="1" height="1" alt="" /></div><!--DIVIDER_END//-->
<!--FEEDINFO_START//--><p style="margin-left:3px;margin-bottom:8px;">{IMAGE}</p><!--FEEDINFO_END//-->
<!--RSSFEED_START//-->[TITLE]<h3>{TITLE}</h3>[/TITLE][SUBTITLE]<h4>{SUBTITLE}</h4>[/SUBTITLE]<div>{FEEDINFO}{ITEMS}</div><!--RSSFEED_END//-->';
$rssfeed['template'] = '<!--ITEM_START//--><li><a href="{LINK}" target="_blank">{TITLE}</a></li><!--ITEM_END//-->
<!--DIVIDER_START//--><hr /><!--DIVIDER_END//-->
<!--FEEDINFO_START//--><p>{IMAGE}</p><!--FEEDINFO_END//-->
<!--RSSFEED_START//-->[TITLE]<h3>{TITLE}</h3>[/TITLE][SUBTITLE]<h4>{SUBTITLE}</h4>[/SUBTITLE]<div class="rss-feed">{FEEDINFO}<ul>{ITEMS}</ul></div><!--RSSFEED_END//-->';

}

Expand Down
8 changes: 4 additions & 4 deletions include/inc_front/content/cnt29.article.inc.php
View file
Expand Up @@ -205,7 +205,7 @@
$list_img_style = '';
$list_ahref_style = '';
}
$list_img_temp .= $thumb_image[3].' alt="'.$caption[1].'"'.$caption[3].' border="0" />';
$list_img_temp .= $thumb_image[3].' alt="'.$caption[1].'"'.$caption[3].' border="0" class="'.$template_default['classes']['image-thumb'].'" />';
$img_a = '';

if($image['zoom'] && isset($zoominfo) && $zoominfo != false) {
Expand All @@ -223,7 +223,7 @@

$img_thumb_link = '<a href="'.$open_link."\" onclick=\"checkClickZoom();clickZoom('".$open_popup_link."','previewpic','width=";
$img_thumb_link .= $zoominfo[1].",height=".$zoominfo[2]."');".$return_false.'"'.$caption[2][1];
$img_thumb_link .= $list_ahref_style.'>';
$img_thumb_link .= $list_ahref_style.' class="'.$template_default['classes']['image-zoom'].'">';

$img_a .= $img_thumb_link;

Expand All @@ -238,7 +238,7 @@
$img_thumb_link .= 'title="'.parseLightboxCaption( $image['images'][$key][1] ).'" ';
}

$img_thumb_link .= $list_ahref_style.'target="_blank">';
$img_thumb_link .= $list_ahref_style.'class="'.$template_default['classes']['image-lightbox'].'">';

$img_a .= $img_thumb_link;

Expand All @@ -255,7 +255,7 @@
} else {
// if not click enlarge
if($caption[2][0]) {
$img_thumb_link = '<a href="'.$caption[2][0].'" '.$list_ahref_style.$caption[2][1].'>';
$img_thumb_link = '<a href="'.$caption[2][0].'" '.$list_ahref_style.$caption[2][1].' class="'.$template_default['classes']['image-link'].'">';
$img_a .= $img_thumb_link.$list_img_temp.'</a>';
} else {
$img_a .= $list_img_temp;
Expand Down
8 changes: 4 additions & 4 deletions include/inc_front/content/cnt31.article.inc.php
View file
Expand Up @@ -233,7 +233,7 @@
$list_img_style = '';
$list_ahref_style = '';
}
$list_img_temp .= $thumb_image[3].' alt="'.$caption[1].'"'.$caption[3].' border="0" />';
$list_img_temp .= $thumb_image[3].' alt="'.$caption[1].'"'.$caption[3].' border="0" class="'.$template_default['classes']['image-thumb'].'" />';
$img_a = '';
$lightbox_capt = '';

Expand All @@ -256,7 +256,7 @@

$img_thumb_link = '<a href="'.$open_link."\" onclick=\"checkClickZoom();clickZoom('".$open_popup_link."','previewpic','width=";
$img_thumb_link .= $zoominfo[1].",height=".$zoominfo[2]."');".$return_false.'"'.$caption[2][1];
$img_thumb_link .= $list_ahref_style.'>';
$img_thumb_link .= $list_ahref_style.' class="'.$template_default['classes']['image-zoom'].'">';

$img_a .= $img_thumb_link;

Expand All @@ -265,7 +265,7 @@
// lightbox
$img_thumb_link = '<a href="'.PHPWCMS_IMAGES.$zoominfo[0].'" rel="lightbox['.$image['lightbox'].']" ';
$img_thumb_link .= $lightbox_capt;
$img_thumb_link .= $list_ahref_style.'target="_blank">';
$img_thumb_link .= $list_ahref_style.' class="'.$template_default['classes']['image-lightbox'].'">';

$img_a .= $img_thumb_link;

Expand All @@ -286,7 +286,7 @@
} else {
// if not click enlarge
if($caption[2][0]) {
$img_thumb_link = '<a href="'.$caption[2][0].'" '.$list_ahref_style.$caption[2][1].'>';
$img_thumb_link = '<a href="'.$caption[2][0].'" '.$list_ahref_style.$caption[2][1].' class="'.$template_default['classes']['image-link'].'">';
$img_a .= $img_thumb_link.$list_img_temp.'</a>';
} else {
$img_a .= $list_img_temp;
Expand Down
16 changes: 9 additions & 7 deletions include/inc_front/front.func.inc.php
View file
Expand Up @@ -78,7 +78,7 @@ function plugin_size($mediatype, $player, $width, $height) {
function must_filled($c) {
//spaceholder for form fields that have to be filled
//with some content or has to be marked or like that
return intval($c) ? '<img src="img/article/fill_in_here.gif" border="0" alt="" />' : '';
return intval($c) ? '<img src="img/article/fill_in_here.gif" alt="" />' : '';
}

function add_attribute($baseval, $attribute, $val, $space=" ") {
Expand Down Expand Up @@ -1333,7 +1333,7 @@ function list_articles_summary($alt=NULL, $topcount=99999, $template='') {
$caption[3] = empty($caption[3]) ? '' : ' title="'.html_specialchars($caption[3]).'"';
$caption[1] = html_specialchars($caption[1]);

$thumb_img = '<img src="'.PHPWCMS_IMAGES . $thumb_image[0] .'" border="0" '.$thumb_image[3].' alt="'.$caption[1].'"'.$caption[3].' />';
$thumb_img = '<img src="'.PHPWCMS_IMAGES . $thumb_image[0] .'" '.$thumb_image[3].' alt="'.$caption[1].'"'.$caption[3].' class="'.$GLOBALS['template_default']['classes']['image-thumb'].'" />';

if($article["article_image"]["list_zoom"]) {

Expand Down Expand Up @@ -1372,7 +1372,7 @@ function list_articles_summary($alt=NULL, $topcount=99999, $template='') {
$article["article_image"]["poplink"] .= 'onclick="checkClickZoom();clickZoom(\''.$open_link;
$article["article_image"]["poplink"] .= "','previewpic','width=".$zoominfo[1];
$article["article_image"]["poplink"] .= ",height=".$zoominfo[2]."');".$return_false;
$article["article_image"]["poplink"] .= '"'.$caption[2][1].'>';
$article["article_image"]["poplink"] .= '"'.$caption[2][1].' class="'.$GLOBALS['template_default']['classes']['image-zoom'].'">';
} else {
// lightbox
initSlimbox();
Expand All @@ -1381,7 +1381,7 @@ function list_articles_summary($alt=NULL, $topcount=99999, $template='') {
if($article["article_image"]["list_caption"]) {
$article["article_image"]["poplink"] .= 'title="'.parseLightboxCaption($article["article_image"]["list_caption"]).'" ';
}
$article["article_image"]["poplink"] .= 'target="_blank">';
$article["article_image"]["poplink"] .= 'class="'.$GLOBALS['template_default']['classes']['image-lightbox'].'">';
}

$article["article_image"]["poplink"] .= $thumb_img.'</a>';
Expand Down Expand Up @@ -1501,7 +1501,7 @@ function list_articles_summary($alt=NULL, $topcount=99999, $template='') {
$listing .= getFrontendEditLink('summary', $article['article_id']);
}

$listing .= '<a href="'.$article_link.'">';
$listing .= '<a href="'.$article_link.'" class="'.$GLOBALS['template_default']['classes']['link-article-listing'].'">';
$listing .= $template_default["list_startimage"];
$listing .= html_specialchars($article["article_title"]);
$listing .= '</a>'.$template_default["list_headline_after"];
Expand Down Expand Up @@ -1653,12 +1653,14 @@ function html_parser($string) {
array(
'&#92;&#039;',
'&amp;quot;',
'-//-'
'-//-',
' class=""'
),
array(
'&#039;',
'&quot;',
' '
' ',
''
),
$string
);
Expand Down

1 comment on commit c4615cb

@jensensen
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a great step. Great stuff! Thank you very much!

Please sign in to comment.