Changeset 19352


Ignore:
Timestamp:
Dec 9, 2012, 1:27:55 AM (11 years ago)
Author:
julien1311
Message:

css and admin improvements

Location:
extensions/Media_Icon
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • extensions/Media_Icon/admin/admin.css

    r19337 r19352  
    99}
    1010
    11 .media_icon_admin_youtube,
    12 .media_icon_admin_vimeo,
    13 .media_icon_admin_dailymotion,
    14 .media_icon_admin_wat,
    15 .media_icon_admin_wideo,
    16 .media_icon_admin_video,
    17 .media_icon_admin_music,
    18 .media_icon_admin_pdf,
    19 .media_icon_admin_document,
    20 .media_icon_admin_spreadsheet,
    21 .media_icon_admin_presentation   {
     11.media_icon_admin   {
    2212        width: 60px;
    2313        height: 60px;
  • extensions/Media_Icon/admin/admin_general.php

    r19335 r19352  
    1414
    1515//Parameters of the template
     16$template->assign('media_icon_style',$conf_media_icon_general['style']);
    1617$template->assign(
    17         'media_icon_style',
     18        'media_icon_style_selected',
    1819        array(
    19                 'logo' => (($conf_media_icon_general['style'] == 'logo') ? true : false),
    20                 'photo' => (($conf_media_icon_general['style'] == 'photo') ? true : false),
    21                 'folder' => (($conf_media_icon_general['style'] == 'folder') ? true : false),
    22                 'foldercolor' => (($conf_media_icon_general['style'] == 'foldercolor') ? true : false),
     20                'logo' => (($conf_media_icon_general['style'] == 'logo') ? 'selected = "selected"' : ""),
     21                'photo' => (($conf_media_icon_general['style'] == 'photo') ? 'selected = "selected"' : ""),
     22                'folder' => (($conf_media_icon_general['style'] == 'folder') ? 'selected = "selected"' : ""),
     23                'foldercolor' => (($conf_media_icon_general['style'] == 'foldercolor') ? 'selected = "selected"' : ""),
    2324        )
    2425);
    25        
     26
    2627//Add our template to the global template
    2728$template->set_filenames(
    2829        array(
    2930                'plugin_admin_content' => dirname(__FILE__).'/admin_general.tpl'
    30         )   
     31        )
    3132);
    3233 
  • extensions/Media_Icon/admin/admin_general.tpl

    r19337 r19352  
    4747        <p>     
    4848                <select id="media_icon_select" name="media_icon_style">
    49                         <option value="logo"{if $media_icon_style.logo} selected="selected"{/if}>{'Logo'|@translate}</option>
    50                         <option value="photo"{if $media_icon_style.photo} selected="selected"{/if}>{'Photo'|@translate}</option>
    51                         <option value="folder"{if $media_icon_style.folder} selected="selected"{/if}>{'Folder'|@translate}</option>
    52                         <option value="foldercolor"{if $media_icon_style.foldercolor} selected="selected"{/if}>{'Folder color'|@translate}</option>
     49                        <option value="logo"{$media_icon_style_selected.logo}>{'Logo'|@translate}</option>
     50                        <option value="photo"{$media_icon_style_selected.photo}>{'Photo'|@translate}</option>
     51                        <option value="folder"{$media_icon_style_selected.folder}>{'Folder'|@translate}</option>
     52                        <option value="foldercolor"{$media_icon_style_selected.foldercolor}>{'Folder color'|@translate}</option>
    5353                </select>
    5454        </p>
     
    6161<fieldset>
    6262        <legend>{'Result'|@translate}</legend>
    63         <div class="media_icon_admin_element">{'Youtube videos'|@translate} <a class="showInfo" title="{'Videos added with'|@translate} <a href='http://piwigo.org/ext/extension_view.php?eid=136'>Embedded Videos</a>">i</a><span class="media_icon_admin_youtube"></span></div>
    64         <div class="media_icon_admin_element">{'Vimeo videos'|@translate} <a class="showInfo" title="{'Videos added with'|@translate} <a href='http://piwigo.org/ext/extension_view.php?eid=136'>Embedded Videos</a>">i</a><span class="media_icon_admin_vimeo"></span></div>
    65         <div class="media_icon_admin_element">{'Dailymotion videos'|@translate} <a class="showInfo" title="{'Videos added with'|@translate} <a href='http://piwigo.org/ext/extension_view.php?eid=136'>Embedded Videos</a>">i</a><span class="media_icon_admin_dailymotion"></span></div>
    66         <div class="media_icon_admin_element">{'Wat videos'|@translate} <a class="showInfo" title="{'Videos added with'|@translate} <a href='http://piwigo.org/ext/extension_view.php?eid=136'>Embedded Videos</a>">i</a><span class="media_icon_admin_wat"></span></div>
    67         <div class="media_icon_admin_element">{'Wideo videos'|@translate} <a class="showInfo" title="{'Videos added with'|@translate} <a href='http://piwigo.org/ext/extension_view.php?eid=136'>Embedded Videos</a>">i</a><span class="media_icon_admin_wideo"></span></div>
    68         <div class="media_icon_admin_element">{'Videos'|@translate} <a class="showInfo" title="{'Files supported: webm, webmv, ogv, m4v, flv, mp4'|@translate}">i</a><span class="media_icon_admin_video"></span></div>
    69         <div class="media_icon_admin_element">{'Musics'|@translate} <a class="showInfo" title="{'Files supported: mp3, ogg, oga, m4a, webma, fla, wav'|@translate}">i</a><span class="media_icon_admin_music"></span></div>
    70         <div class="media_icon_admin_element">{'pdf files'|@translate} <a class="showInfo" title="{'Files supported: pdf'|@translate}">i</a><span class="media_icon_admin_pdf"></span></div>
    71         <div class="media_icon_admin_element">{'Documents'|@translate} <a class="showInfo" title="{'Files supported: doc, docx and odt'|@translate}">i</a><span class="media_icon_admin_document"></span></div>
    72         <div class="media_icon_admin_element">{'Spreadsheets'|@translate} <a class="showInfo" title="{'Files supported: xls, xlsx and ods'|@translate}">i</a><span class="media_icon_admin_spreadsheet"></span></div>
    73         <div class="media_icon_admin_element">{'Presentations'|@translate} <a class="showInfo" title="{'Files supported: ppt, pptx and odp'|@translate}">i</a><span class="media_icon_admin_presentation"></span></div>
     63        <div class="media_icon_admin_element">{'Youtube videos'|@translate} <a class="showInfo" title="{'Videos added with'|@translate} <a href='http://piwigo.org/ext/extension_view.php?eid=136'>Embedded Videos</a>">i</a><span class="media_icon_admin media_icon_admin_youtube_{$media_icon_style}"></span></div>
     64        <div class="media_icon_admin_element">{'Vimeo videos'|@translate} <a class="showInfo" title="{'Videos added with'|@translate} <a href='http://piwigo.org/ext/extension_view.php?eid=136'>Embedded Videos</a>">i</a><span class="media_icon_admin media_icon_admin_vimeo_{$media_icon_style}"></span></div>
     65        <div class="media_icon_admin_element">{'Dailymotion videos'|@translate} <a class="showInfo" title="{'Videos added with'|@translate} <a href='http://piwigo.org/ext/extension_view.php?eid=136'>Embedded Videos</a>">i</a><span class="media_icon_admin media_icon_admin_dailymotion_{$media_icon_style}"></span></div>
     66        <div class="media_icon_admin_element">{'Wat videos'|@translate} <a class="showInfo" title="{'Videos added with'|@translate} <a href='http://piwigo.org/ext/extension_view.php?eid=136'>Embedded Videos</a>">i</a><span class="media_icon_admin media_icon_admin_wat_{$media_icon_style}"></span></div>
     67        <div class="media_icon_admin_element">{'Wideo videos'|@translate} <a class="showInfo" title="{'Videos added with'|@translate} <a href='http://piwigo.org/ext/extension_view.php?eid=136'>Embedded Videos</a>">i</a><span class="media_icon_admin media_icon_admin_wideo_{$media_icon_style}"></span></div>
     68        <div class="media_icon_admin_element">{'Videos'|@translate} <a class="showInfo" title="{'Files supported: webm, webmv, ogv, m4v, flv, mp4'|@translate}">i</a><span class="media_icon_admin media_icon_admin_video_{$media_icon_style}"></span></div>
     69        <div class="media_icon_admin_element">{'Musics'|@translate} <a class="showInfo" title="{'Files supported: mp3, ogg, oga, m4a, webma, fla, wav'|@translate}">i</a><span class="media_icon_admin media_icon_admin_music_{$media_icon_style}"></span></div>
     70        <div class="media_icon_admin_element">{'pdf files'|@translate} <a class="showInfo" title="{'Files supported: pdf'|@translate}">i</a><span class="media_icon_admin media_icon_admin_pdf_{$media_icon_style}"></span></div>
     71        <div class="media_icon_admin_element">{'Documents'|@translate} <a class="showInfo" title="{'Files supported: doc, docx and odt'|@translate}">i</a><span class="media_icon_admin media_icon_admin_document_{$media_icon_style}"></span></div>
     72        <div class="media_icon_admin_element">{'Spreadsheets'|@translate} <a class="showInfo" title="{'Files supported: xls, xlsx and ods'|@translate}">i</a><span class="media_icon_admin media_icon_admin_spreadsheet_{$media_icon_style}"></span></div>
     73        <div class="media_icon_admin_element">{'Presentations'|@translate} <a class="showInfo" title="{'Files supported: ppt, pptx and odp'|@translate}">i</a><span class="media_icon_admin media_icon_admin_presentation_{$media_icon_style}"></span></div>
    7474</fieldset>
  • extensions/Media_Icon/language/fr_FR/plugin.lang.php

    r19337 r19352  
    2222$lang['Wideo videos'] = 'Vidéos Wideo';
    2323$lang['Videos'] = 'Vidéos';
    24 $lang['Musics'] = 'Musics';
     24$lang['Musics'] = 'Musiques';
    2525$lang['pdf files'] = 'Fichiers pdf';
    2626$lang['Documents'] = 'Documents';
  • extensions/Media_Icon/main.inc.php

    r19338 r19352  
    3333
    3434/* +-----------------------------------------------------------------------+
    35  * | Plugin code                                                          |
     35 * | Plugin code                                                           |
    3636 * +-----------------------------------------------------------------------+ */
    3737       
     
    4040
    4141/* +-----------------------------------------------------------------------+
    42  * | CSS Style                                                          |
     42 * | CSS Style                                                             |
    4343 * +-----------------------------------------------------------------------+ */
    4444
     
    5252        //add a stylesheet
    5353        $template->append('head_elements', '<link rel="stylesheet" type="text/css" href="'.MEDIA_ICON_PATH.'template/media_icon.css">');
    54         $template->append('head_elements', '<link rel="stylesheet" type="text/css" href="'.MEDIA_ICON_PATH.'template/'.$conf_media_icon_general['style'].'_media_icon.css">');
    5554        $template->append('head_elements', '<link rel="stylesheet" type="text/css" href="'.MEDIA_ICON_PATH.'admin/admin.css">');
    5655}
  • extensions/Media_Icon/picture.php

    r19338 r19352  
    44
    55function media_icon_add_tag_picture($content, $element_info) {
     6        global $conf;
     7       
     8        $conf_media_icon_general = unserialize($conf['media_icon_general']);
    69        $media_icon_type = "";
    710       
     
    4245                preg_match('/<\s*img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i',$content,$match);
    4346       
    44                 $content = str_replace($match[0],'<span class="media_icon_'.$media_icon_type.'"></span>'.$match[0].'</a>',$content);
     47                $content = str_replace($match[0],'<span class="media_icon media_icon_'.$media_icon_type.'_'.$conf_media_icon_general['style'].'"></span>'.$match[0].'</a>',$content);
    4548        }
    4649       
  • extensions/Media_Icon/template/media_icon.css

    r19337 r19352  
    1 .media_icon_youtube,
    2 .media_icon_vimeo,
    3 .media_icon_dailymotion,
    4 .media_icon_wat,
    5 .media_icon_wideo,
    6 .media_icon_video,
    7 .media_icon_music,
    8 .media_icon_pdf,
    9 .media_icon_document,
    10 .media_icon_spreadsheet,
    11 .media_icon_presentation   {
     1.media_icon  {
    122        width: 60px;
    133        height: 60px;
    144        z-index:99;
    155}
     6
     7/* +-----------------------------------------------------------------------+
     8 * | logo                                                                  |
     9 * +-----------------------------------------------------------------------+ */
     10
     11 .media_icon_youtube_logo, .media_icon_admin_youtube_logo {
     12        background: transparent url('img/logo_youtube.png') no-repeat;
     13}
     14
     15.media_icon_vimeo_logo, .media_icon_admin_vimeo_logo {
     16        background: transparent url('img/logo_vimeo.png') no-repeat;
     17}
     18
     19.media_icon_dailymotion_logo, .media_icon_admin_dailymotion_logo {
     20        background: transparent url('img/logo_dailymotion.png') no-repeat;
     21}
     22
     23.media_icon_wat_logo, .media_icon_admin_wat_logo {
     24        background: transparent url('img/logo_wat.png') no-repeat;
     25}
     26
     27.media_icon_wideo_logo, .media_icon_admin_wideo_logo {
     28        background: transparent url('img/logo_wideo.png') no-repeat;
     29}
     30
     31.media_icon_video_logo, .media_icon_admin_video_logo {
     32        background: transparent url('img/logo_video.png') no-repeat;
     33}
     34
     35.media_icon_music_logo, .media_icon_admin_music_logo {
     36        background: transparent url('img/logo_music.png') no-repeat;
     37}
     38
     39.media_icon_pdf_logo, .media_icon_admin_pdf_logo {
     40        background: transparent url('img/logo_pdf.png') no-repeat;
     41}
     42
     43.media_icon_document_logo, .media_icon_admin_document_logo {
     44        background: transparent url('img/logo_document.png') no-repeat;
     45}
     46
     47.media_icon_spreadsheet_logo, .media_icon_admin_spreadsheet_logo {
     48        background: transparent url('img/logo_spreadsheet.png') no-repeat;
     49}
     50
     51.media_icon_presentation_logo, .media_icon_admin_presentation_logo {
     52        background: transparent url('img/logo_presentation.png') no-repeat;
     53}
     54 
     55/* +-----------------------------------------------------------------------+
     56 * | photo                                                                 |
     57 * +-----------------------------------------------------------------------+ */
     58 
     59.media_icon_youtube_photo, .media_icon_admin_youtube_photo {
     60        background: transparent url('img/photo_video.png') no-repeat;
     61}
     62
     63.media_icon_vimeo_photo, .media_icon_admin_vimeo_photo {
     64        background: transparent url('img/photo_video.png') no-repeat;
     65}
     66
     67.media_icon_dailymotion_photo, .media_icon_admin_dailymotion_photo {
     68        background: transparent url('img/photo_video.png') no-repeat;
     69}
     70
     71.media_icon_wat_photo, .media_icon_admin_wat_photo {
     72        background: transparent url('img/photo_video.png') no-repeat;
     73}
     74
     75.media_icon_wideo_photo, .media_icon_admin_wideo_photo {
     76        background: transparent url('img/photo_video.png') no-repeat;
     77}
     78
     79.media_icon_video_photo, .media_icon_admin_video_photo {
     80        background: transparent url('img/photo_video.png') no-repeat;
     81}
     82
     83.media_icon_music_photo, .media_icon_admin_music_photo {
     84        background: transparent url('img/photo_music.png') no-repeat;
     85}
     86
     87.media_icon_pdf_photo, .media_icon_admin_pdf_photo {
     88        background: transparent url('img/photo_pdf.png') no-repeat;
     89}
     90
     91.media_icon_document_photo, .media_icon_admin_document_photo {
     92        background: transparent url('img/photo_document.png') no-repeat;
     93}
     94
     95.media_icon_spreadsheet_photo, .media_icon_admin_spreadsheet_photo {
     96        background: transparent url('img/photo_spreadsheet.png') no-repeat;
     97}
     98
     99.media_icon_presentation_photo, .media_icon_admin_presentation_photo {
     100        background: transparent url('img/photo_presentation.png') no-repeat;
     101}
     102
     103/* +-----------------------------------------------------------------------+
     104 * | folder                                                                |
     105 * +-----------------------------------------------------------------------+ */
     106 
     107 .media_icon_youtube_folder, .media_icon_admin_youtube_folder {
     108        background: transparent url('img/folder_video.png') no-repeat;
     109}
     110
     111.media_icon_vimeo_folder, .media_icon_admin_vimeo_folder {
     112        background: transparent url('img/folder_video.png') no-repeat;
     113}
     114
     115.media_icon_dailymotion_folder, .media_icon_admin_dailymotion_folder {
     116        background: transparent url('img/folder_video.png') no-repeat;
     117}
     118
     119.media_icon_wat_folder, .media_icon_admin_wat_folder {
     120        background: transparent url('img/folder_video.png') no-repeat;
     121}
     122
     123.media_icon_wideo_folder, .media_icon_admin_wideo_folder {
     124        background: transparent url('img/folder_video.png') no-repeat;
     125}
     126
     127.media_icon_video_folder, .media_icon_admin_video_folder {
     128        background: transparent url('img/folder_video.png') no-repeat;
     129}
     130
     131.media_icon_music_folder, .media_icon_admin_music_folder {
     132        background: transparent url('img/folder_music.png') no-repeat;
     133}
     134
     135.media_icon_pdf_folder, .media_icon_admin_pdf_folder {
     136        background: transparent url('img/folder_pdf.png') no-repeat;
     137}
     138
     139.media_icon_document_folder, .media_icon_admin_document_folder {
     140        background: transparent url('img/folder_document.png') no-repeat;
     141}
     142
     143.media_icon_spreadsheet_folder, .media_icon_admin_spreadsheet_folder {
     144        background: transparent url('img/folder_spreadsheet.png') no-repeat;
     145}
     146
     147.media_icon_presentation_folder, .media_icon_admin_presentation_folder {
     148        background: transparent url('img/folder_presentation.png') no-repeat;
     149}
     150
     151/* +-----------------------------------------------------------------------+
     152 * | foldercolor                                                           |
     153 * +-----------------------------------------------------------------------+ */
     154 
     155 .media_icon_youtube_foldercolor, .media_icon_admin_youtube_foldercolor {
     156        background: transparent url('img/foldercolor_video.png') no-repeat;
     157}
     158
     159.media_icon_vimeo_foldercolor, .media_icon_admin_vimeo_foldercolor {
     160        background: transparent url('img/foldercolor_video.png') no-repeat;
     161}
     162
     163.media_icon_dailymotion_foldercolor, .media_icon_admin_dailymotion_foldercolor {
     164        background: transparent url('img/foldercolor_video.png') no-repeat;
     165}
     166
     167.media_icon_wat_foldercolor, .media_icon_admin_wat_foldercolor {
     168        background: transparent url('img/foldercolor_video.png') no-repeat;
     169}
     170
     171.media_icon_wideo_foldercolor, .media_icon_admin_wideo_foldercolor {
     172        background: transparent url('img/foldercolor_video.png') no-repeat;
     173}
     174
     175.media_icon_video_foldercolor, .media_icon_admin_video_foldercolor {
     176        background: transparent url('img/foldercolor_video.png') no-repeat;
     177}
     178
     179.media_icon_music_foldercolor, .media_icon_admin_music_foldercolor {
     180        background: transparent url('img/foldercolor_music.png') no-repeat;
     181}
     182
     183.media_icon_pdf_foldercolor, .media_icon_admin_pdf_foldercolor {
     184        background: transparent url('img/foldercolor_pdf.png') no-repeat;
     185}
     186
     187.media_icon_document_foldercolor, .media_icon_admin_document_foldercolor {
     188        background: transparent url('img/foldercolor_document.png') no-repeat;
     189}
     190
     191.media_icon_spreadsheet_foldercolor, .media_icon_admin_spreadsheet_foldercolor {
     192        background: transparent url('img/foldercolor_spreadsheet.png') no-repeat;
     193}
     194
     195.media_icon_presentation_foldercolor, .media_icon_admin_presentation_foldercolor {
     196        background: transparent url('img/foldercolor_presentation.png') no-repeat;
     197}
  • extensions/Media_Icon/template/media_icon_picture.tpl

    r19337 r19352  
    22{literal}
    33<style type="text/css">
    4         .media_icon_pdf, .media_icon_admin_pdf {
     4        .media_icon {
    55{/literal}
    66                opacity: {$media_icon_advanced.opacity/100};
    77                moz-opacity: {$media_icon_advanced.opacity/100};
    88                filter:alpha(opacity={$media_icon_advanced.opacity});
    9 {literal}
    10         }
    11 .media_icon_youtube,
    12 .media_icon_vimeo,
    13 .media_icon_dailymotion,
    14 .media_icon_wat,
    15 .media_icon_wideo,
    16 .media_icon_video,
    17 .media_icon_music,
    18 .media_icon_pdf,
    19 .media_icon_document,
    20 .media_icon_spreadsheet,
    21 .media_icon_presentation {
    22 {/literal}
    23         position: absolute;
    24         {$media_icon_advanced.xposition};
    25         {$media_icon_advanced.yposition};
     9                position: absolute;
     10                {$media_icon_advanced.xposition};
     11                {$media_icon_advanced.yposition};
    2612{literal}
    2713}
  • extensions/Media_Icon/template/media_icon_thumbnails.tpl

    r19337 r19352  
    22{literal}
    33<style type="text/css">
    4         .media_icon_pdf, .media_icon_admin_pdf {
     4        .media_icon {
    55{/literal}
    66                opacity: {$media_icon_advanced.opacity/100};
    77                moz-opacity: {$media_icon_advanced.opacity/100};
    88                filter:alpha(opacity={$media_icon_advanced.opacity});
    9 {literal}
    10         }
    11 .media_icon_youtube,
    12 .media_icon_vimeo,
    13 .media_icon_dailymotion,
    14 .media_icon_wat,
    15 .media_icon_wideo,
    16 .media_icon_video,
    17 .media_icon_music,
    18 .media_icon_pdf,
    19 .media_icon_document,
    20 .media_icon_spreadsheet,
    21 .media_icon_presentation {
    22 {/literal}
    23         position: absolute;
    24         {$media_icon_advanced.xposition};
    25         {$media_icon_advanced.yposition};
     9                position: absolute;
     10                {$media_icon_advanced.xposition};
     11                {$media_icon_advanced.yposition};
    2612{literal}
    2713}
     
    3016        //Add Media Icon markups to thumbnails
    3117        function media_icon_markup() {
     18{/literal}
    3219                //Youtube
    33                 $("img[media_icon^=youtube]").before('<span class="media_icon_youtube"></span>');
     20                $("img[media_icon^=youtube]").before('<span class="media_icon media_icon_youtube_{$media_icon_style}"></span>');
    3421                //Vimeo
    35                 $("img[media_icon^=vimeo]").before('<span class="media_icon_vimeo"></span>');
     22                $("img[media_icon^=vimeo]").before('<span class="media_icon media_icon_vimeo_{$media_icon_style}"></span>');
    3623                //Dailymotion
    37                 $("img[media_icon^=dailymotion]").before('<span class="media_icon_dailymotion"></span>');
     24                $("img[media_icon^=dailymotion]").before('<span class="media_icon media_icon_dailymotion_{$media_icon_style}"></span>');
    3825                //Wat
    39                 $("img[media_icon^=wat]").before('<span class="media_icon_wat"></span>');
     26                $("img[media_icon^=wat]").before('<span class="media_icon media_icon_wat_{$media_icon_style}"></span>');
    4027                //Wideo
    41                 $("img[media_icon^=wideo]").before('<span class="media_icon_wideo"></span>');
     28                $("img[media_icon^=wideo]").before('<span class="media_icon media_icon_wideo_{$media_icon_style}"></span>');
    4229                //Video
    43                 $("img[media_icon$=webm]").before('<span class="media_icon_video"></span>');
    44                 $("img[media_icon$=webmv]").before('<span class="media_icon_video"></span>');
    45                 $("img[media_icon$=ogv]").before('<span class="media_icon_video"></span>');
    46                 $("img[media_icon$=m4v]").before('<span class="media_icon_video"></span>');
    47                 $("img[media_icon$=flv]").before('<span class="media_icon_video"></span>');
    48                 $("img[media_icon$=mp4]").before('<span class="media_icon_video"></span>');
     30                $("img[media_icon$=webm]").before('<span class="media_icon media_icon_video_{$media_icon_style}"></span>');
     31                $("img[media_icon$=webmv]").before('<span class="media_icon media_icon_video_{$media_icon_style}"></span>');
     32                $("img[media_icon$=ogv]").before('<span class="media_icon media_icon_video_{$media_icon_style}"></span>');
     33                $("img[media_icon$=m4v]").before('<span class="media_icon media_icon_video_{$media_icon_style}"></span>');
     34                $("img[media_icon$=flv]").before('<span class="media_icon media_icon_video_{$media_icon_style}"></span>');
     35                $("img[media_icon$=mp4]").before('<span class="media_icon media_icon_video_{$media_icon_style}"></span>');
    4936                //Music
    50                 $("img[media_icon$=mp3]").before('<span class="media_icon_music"></span>');
    51                 $("img[media_icon$=ogg]").before('<span class="media_icon_music"></span>');
    52                 $("img[media_icon$=oga]").before('<span class="media_icon_music"></span>');
    53                 $("img[media_icon$=m4a]").before('<span class="media_icon_music"></span>');
    54                 $("img[media_icon$=webma]").before('<span class="media_icon_music"></span>');
    55                 $("img[media_icon$=fla]").before('<span class="media_icon_music"></span>');
    56                 $("img[media_icon$=wav]").before('<span class="media_icon_music"></span>');
     37                $("img[media_icon$=mp3]").before('<span class="media_icon media_icon_music_{$media_icon_style}"></span>');
     38                $("img[media_icon$=ogg]").before('<span class="media_icon media_icon_music_{$media_icon_style}"></span>');
     39                $("img[media_icon$=oga]").before('<span class="media_icon media_icon_music_{$media_icon_style}"></span>');
     40                $("img[media_icon$=m4a]").before('<span class="media_icon media_icon_music_{$media_icon_style}"></span>');
     41                $("img[media_icon$=webma]").before('<span class="media_icon media_icon_music_{$media_icon_style}"></span>');
     42                $("img[media_icon$=fla]").before('<span class="media_icon media_icon_music_{$media_icon_style}"></span>');
     43                $("img[media_icon$=wav]").before('<span class="media_icon media_icon_music_{$media_icon_style}"></span>');
    5744                //pdf
    58                 $("img[media_icon$=pdf]").before('<span class="media_icon_pdf"></span>');
     45                $("img[media_icon$=pdf]").before('<span class="media_icon media_icon media_icon_pdf_{$media_icon_style}"></span>');
    5946                //doc, docx or odt
    60                 $("img[media_icon$=doc]").before('<span class="media_icon_document"></span>');
    61                 $("img[media_icon$=docx]").before('<span class="media_icon_document"></span>');
    62                 $("img[media_icon$=odt]").before('<span class="media_icon_document"></span>');
     47                $("img[media_icon$=doc]").before('<span class="media_icon media_icon_document_{$media_icon_style}"></span>');
     48                $("img[media_icon$=docx]").before('<span class="media_icon media_icon_document_{$media_icon_style}"></span>');
     49                $("img[media_icon$=odt]").before('<span class="media_icon media_icon_document_{$media_icon_style}"></span>');
    6350                //xls, xlsx or ods
    64                 $("img[media_icon$=xls]").before('<span class="media_icon_spreadsheet"></span>');
    65                 $("img[media_icon$=xlsx]").before('<span class="media_icon_spreadsheet"></span>');
    66                 $("img[media_icon$=ods]").before('<span class="media_icon_spreadsheet"></span>');
     51                $("img[media_icon$=xls]").before('<span class="media_icon media_icon_spreadsheet_{$media_icon_style}"></span>');
     52                $("img[media_icon$=xlsx]").before('<span class="media_icon media_icon_spreadsheet_{$media_icon_style}"></span>');
     53                $("img[media_icon$=ods]").before('<span class="media_icon media_icon_spreadsheet_{$media_icon_style}"></span>');
    6754                //ppt, pptx or odp
    68                 $("img[media_icon$=ppt]").before('<span class="media_icon_presentation"></span>');
    69                 $("img[media_icon$=pptx]").before('<span class="media_icon_presentation"></span>');
    70                 $("img[media_icon$=odp]").before('<span class="media_icon_presentation"></span>');
     55                $("img[media_icon$=ppt]").before('<span class="media_icon media_icon_presentation_{$media_icon_style}"></span>');
     56                $("img[media_icon$=pptx]").before('<span class="media_icon media_icon_presentation_{$media_icon_style}"></span>');
     57                $("img[media_icon$=odp]").before('<span class="media_icon media_icon_presentation_{$media_icon_style}"></span>');
     58{literal}
    7159        }
    7260 
  • extensions/Media_Icon/thumbnails.php

    r19338 r19352  
    55        global $template, $conf;
    66
     7        $conf_media_icon_general = unserialize($conf['media_icon_general']);
    78        $conf_media_icon_advanced = unserialize($conf['media_icon_advanced']);
    89       
     
    1011       
    1112        $template->set_filename('media_icon_template', dirname(__FILE__).'/template/media_icon_thumbnails.tpl');
     13       
     14        $template->assign('media_icon_style',$conf_media_icon_general['style']);
    1215       
    1316        $template->assign(
Note: See TracChangeset for help on using the changeset viewer.