Changeset 19304


Ignore:
Timestamp:
Dec 6, 2012, 4:34:14 PM (8 years ago)
Author:
EvilKant
Message:
 
Location:
extensions/Evil_Blog
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • extensions/Evil_Blog/admin.css

    r18997 r19304  
    44input[name="cansel_post_form"] {
    55        margin-left: 10px;
     6}
     7form[name="config_form"] fieldset table tr td:nth-child(2n) {
     8        text-align: center;
    69}
    710.evil_blog_posts{
  • extensions/Evil_Blog/blog.php

    r19072 r19304  
    5151                        }
    5252                //îïðåäåëÿåì çàãîëîâîê
    53                 if (($page['evil_blog']['show_on_main_page']) and ($tokens[0]!='blog')) {
     53                if ((($page['evil_blog']['show_on_main_page']) or ($page['evil_blog']['show_on_category_page'])) and ($tokens[0]!='blog')) {
    5454                        $place = 'PLUGIN_INDEX_CONTENT_BEFORE';
    55                         $template->assign('TITLE', '<div id="content" class="content contentWithMenu"><h2>'.$page['evil_blog']['blog_name'].'</h2>');
     55                        $template->assign('TITLE',
     56                                '<div id="content" class="content contentWithMenu"><div class="titrePage"><h2>'.$page['evil_blog']['blog_name'].
     57                                '<a id="blog_rss_icon" href="'.get_gallery_home_url().'?/blog/feed" title="'.l10n("Notification").'"><img src="'.get_gallery_home_url().'plugins/Evil_Blog/RSS.png"></a></h2></div>');
    5658                        $template->assign('TITLE_END', '</div>');
    5759                        }else{//õëåáíûå êðîøêè
    5860                        $place = 'PLUGIN_INDEX_CONTENT_END';
    59                         $page['title'] = '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].$page['evil_blog']['blog_name'];
     61                        $page['title'] =
     62                                '<a href="'.get_gallery_home_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].$page['evil_blog']['blog_name'].
     63                                '<a id="blog_rss_icon" href="'.get_gallery_home_url().'?/blog/feed" title="'.l10n("Notification").'"><img src="'.get_gallery_home_url().'plugins/Evil_Blog/RSS.png"></a>';
    6064                        $template->assign('TITLE_END', ' ');
    6165                        }
  • extensions/Evil_Blog/blog.tpl

    r19055 r19304  
    1                 {$TITLE}
    2                 <a href="{$ROOT_URL}?/blog/feed" title="{'Notification'|@translate}"><img src="{$ROOT_URL}plugins/Evil_Blog/RSS.png"></a>
     1        {$TITLE}
    32                <ul class="evil_blog_posts">
    43                        {foreach from=$row item=value}
  • extensions/Evil_Blog/config.inc.php

    r18997 r19304  
    1717                }else{
    1818                $eb_conf['show_on_main_page'] = false;
     19                }
     20        if (!empty($_POST['show_on_category_page'])) {
     21                $eb_conf['show_on_category_page'] = $_POST['show_on_category_page'];
     22                }else{
     23                $eb_conf['show_on_category_page'] = false;
    1924                }
    2025        if (!empty($_POST['show_number'])) {
     
    4045$template->assign('posts_per_page', $eb_conf['posts_per_page']);
    4146$template->assign('show_on_main_page', $eb_conf['show_on_main_page']);
     47$template->assign('show_on_category_page', $eb_conf['show_on_category_page']);
    4248$template->assign('show_number', $eb_conf['show_number']);
    4349$template->assign('show_date', $eb_conf['show_date']);
  • extensions/Evil_Blog/config.tpl

    r18997 r19304  
    2323                                        <td><input type="checkbox" name="show_on_main_page" {if isset($show_on_main_page) and $show_on_main_page}checked="checked"{/if} onChange="document.config_form.modified.checked=true;"></td>
    2424                                </tr>
     25                                <tr>
     26                                        <td><b>{'show_on_category_page'|@translate}</b></td>
     27                                        <td><input type="checkbox" name="show_on_category_page" {if isset($show_on_category_page) and $show_on_category_page}checked="checked"{/if} onChange="document.config_form.modified.checked=true;"></td>
     28                                </tr>
    2529                                <tr><td colspan="2">
    2630                                <fieldset><legend>{'post_appearance'|@translate}</legend>
     
    3438                                                <td><input type="checkbox" name="show_date" {if isset($show_date) and $show_date}checked="checked"{/if} onChange="document.config_form.modified.checked=true;"></td>
    3539                                        </tr>
    36                                                                                 <tr>
     40                                        <tr>
    3741                                                <td><b>{'date_format'|@translate}</b></td>
    3842                                                <td>
  • extensions/Evil_Blog/language/en_UK/plugin.lang.php

    r19049 r19304  
    2121// version 1.2.0.
    2222        $lang['back'] = 'Back';
     23        $lang['show_on_category_page'] = 'Show on category page';
    2324        ?>
  • extensions/Evil_Blog/language/ru_RU/plugin.lang.php

    r19049 r19304  
    2121// version 1.2.0.
    2222        $lang['back'] = 'Назад';
     23        $lang['show_on_category_page'] = 'Показывать на странице категорий';
    2324?>
  • extensions/Evil_Blog/main.inc.php

    r19049 r19304  
    4040                $page['evil_blog'] = @unserialize($conf['evil_blog']);
    4141               
    42                 //включаем Extended Description для пунктам меню
     42                //включаем Extended Description для пунктов меню
    4343                $ExDesc = pwg_db_fetch_assoc(pwg_query("SELECT state FROM " . PLUGINS_TABLE . " WHERE id = 'ExtendedDescription';"));
    4444                if($ExDesc['state'] == 'active') {
     
    5555                        }
    5656       
    57         if (((empty($tokens[0])) and ($page['evil_blog']['show_on_main_page'])) or
     57        if (((empty($tokens[0])) and ($page['evil_blog']['show_on_main_page'])) or
     58                (($tokens[0]=='categories') and ($page['evil_blog']['show_on_category_page'])) or
    5859                (($tokens[0]=='blog') and ((empty($tokens[1]) or ($tokens[1]!='id'))))) {
    5960                        include_once (Evil_Blog_PATH.'blog.php');
  • extensions/Evil_Blog/maintain.inc.php

    r19048 r19304  
    3131          'blog_description' => 'News Blog',
    3232          'show_on_main_page' => 'on',
    33           'show_number' => 'off',
     33          'show_on_category_page' => 'on',
     34          'show_number' => 'on',
    3435          'show_date' => 'on',
    3536          'date_format' => 'H.i  d/m/Y'
     
    8384          'blog_description' => 'News Blog',
    8485          'show_on_main_page' => 'on',
    85           'show_number' => 'off',
     86          'show_on_category_page' => 'on',
     87          'show_number' => 'on',
    8688          'show_date' => 'on',
    8789          'date_format' => 'H.i  d/m/Y'
  • extensions/Evil_Blog/post.php

    r19141 r19304  
    3434                                $page['title'] .= '<a href="'.get_root_url().'?/blog/'.$npage.'">'.$page['evil_blog']['blog_name'].'</a>';
    3535                        }
    36                 $page['title'] .= $conf['level_separator'].'<a href="'.get_root_url().'?/blog/id/'.$row['id'].'">'.$row['header'].'</a>';
     36                $page['title'] .=
     37                        $conf['level_separator'].'<a href="'.get_root_url().'?/blog/id/'.$row['id'].'">'.$row['header'].'</a>'.
     38                        '<a id="blog_rss_icon" href="'.get_gallery_home_url().'?/blog/feed" title="'.l10n("Notification").'"><img src="'.get_gallery_home_url().'plugins/Evil_Blog/RSS.png"></a>';
    3739               
    3840                //определяем адрес шаблона плагина
  • extensions/Evil_Blog/posts.css

    r19053 r19304  
    2525        text-decoration: none;
    2626}
    27 
    28 /********colorbox**************/
    29 
    30 /*
    31     ColorBox Core Style:
    32     The following CSS is consistent between example themes and should not be altered.
    33 */
    34 #colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
    35 #cboxOverlay{position:fixed; width:100%; height:100%;}
    36 #cboxMiddleLeft, #cboxBottomLeft{clear:left;}
    37 #cboxContent{position:relative;}
    38 #cboxLoadedContent{overflow:auto;}
    39 #cboxTitle{margin:0;}
    40 #cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
    41 #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
    42 .cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
    43 .cboxIframe{width:100%; height:100%; display:block; border:0;}
    44 #colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
    45 
    46 /*
    47     User Style:
    48     Change the following styles to modify the appearance of ColorBox.  They are
    49     ordered & tabbed in a way that represents the nesting of the generated HTML.
    50 */
    51 #cboxOverlay{background:url(js/images/overlay.png) repeat 0 0;}
    52 #colorbox{}
    53     #cboxTopLeft{width:21px; height:21px; background:url(js/images/controls.png) no-repeat -101px 0;}
    54     #cboxTopRight{width:21px; height:21px; background:url(js/images/controls.png) no-repeat -130px 0;}
    55     #cboxBottomLeft{width:21px; height:21px; background:url(js/images/controls.png) no-repeat -101px -29px;}
    56     #cboxBottomRight{width:21px; height:21px; background:url(js/images/controls.png) no-repeat -130px -29px;}
    57     #cboxMiddleLeft{width:21px; background:url(js/images/controls.png) left top repeat-y;}
    58     #cboxMiddleRight{width:21px; background:url(js/images/controls.png) right top repeat-y;}
    59     #cboxTopCenter{height:21px; background:url(js/images/border.png) 0 0 repeat-x;}
    60     #cboxBottomCenter{height:21px; background:url(js/images/border.png) 0 -29px repeat-x;}
    61     #cboxContent{background:#fff; overflow:hidden;}
    62         .cboxIframe{background:#fff;}
    63         #cboxError{padding:50px; border:1px solid #ccc;}
    64         #cboxLoadedContent{margin-bottom:28px;}
    65         #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
    66         #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
    67         #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
    68         #cboxPrevious{position:absolute; bottom:0; left:0; background:url(js/images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}
    69         #cboxPrevious:hover{background-position:-75px -25px;}
    70         #cboxNext{position:absolute; bottom:0; left:27px; background:url(js/images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
    71         #cboxNext:hover{background-position:-50px -25px;}
    72         #cboxLoadingOverlay{background:url(js/images/loading_background.png) no-repeat center center;}
    73         #cboxLoadingGraphic{background:url(js/images/loading.gif) no-repeat center center;}
    74         #cboxClose{position:absolute; bottom:0; right:0; background:url(js/images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}
    75         #cboxClose:hover{background-position:-25px -25px;}
    76 
    77 /*
    78   The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill
    79   when an alpha filter (opacity change) is set on the element or ancestor element.  This style is not applied to or needed in IE9.
    80   See: http://jacklmoore.com/notes/ie-transparency-problems/
    81 */
    82 .cboxIE #cboxTopLeft,
    83 .cboxIE #cboxTopCenter,
    84 .cboxIE #cboxTopRight,
    85 .cboxIE #cboxBottomLeft,
    86 .cboxIE #cboxBottomCenter,
    87 .cboxIE #cboxBottomRight,
    88 .cboxIE #cboxMiddleLeft,
    89 .cboxIE #cboxMiddleRight {
    90     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
     27#blog_rss_icon {
     28        float: right;
    9129}
    92 
    93 /*
    94   The following provides PNG transparency support for IE6
    95   Feel free to remove this and the /ie6/ directory if you have dropped IE6 support.
    96 */
    97 .cboxIE6 #cboxTopLeft{background:url(js/images/ie6/borderTopLeft.png);}
    98 .cboxIE6 #cboxTopCenter{background:url(js/images/ie6/borderTopCenter.png);}
    99 .cboxIE6 #cboxTopRight{background:url(js/images/ie6/borderTopRight.png);}
    100 .cboxIE6 #cboxBottomLeft{background:url(js/images/ie6/borderBottomLeft.png);}
    101 .cboxIE6 #cboxBottomCenter{background:url(js/images/ie6/borderBottomCenter.png);}
    102 .cboxIE6 #cboxBottomRight{background:url(js/images/ie6/borderBottomRight.png);}
    103 .cboxIE6 #cboxMiddleLeft{background:url(js/images/ie6/borderMiddleLeft.png);}
    104 .cboxIE6 #cboxMiddleRight{background:url(js/images/ie6/borderMiddleRight.png);}
    105 
    106 .cboxIE6 #cboxTopLeft,
    107 .cboxIE6 #cboxTopCenter,
    108 .cboxIE6 #cboxTopRight,
    109 .cboxIE6 #cboxBottomLeft,
    110 .cboxIE6 #cboxBottomCenter,
    111 .cboxIE6 #cboxBottomRight,
    112 .cboxIE6 #cboxMiddleLeft,
    113 .cboxIE6 #cboxMiddleRight {
    114     _behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')");
    115 }
Note: See TracChangeset for help on using the changeset viewer.