Changeset 59a51a3


Ignore:
Timestamp:
Jun 22, 2011 6:15:08 PM (3 years ago)
Author:
riccardo <riccardo@…>
Branches:
master, crem, crem2, crem3, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, forma, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, prob, production, release/1.4.4, sabiod, search, security, server, social, storage, telecaster, test, video
Children:
d4c2dd3, 2ef47b8
Parents:
65fa35a
git-author:
riccardo <riccardo@…> (22/06/2011 18:15:08)
git-committer:
riccardo <riccardo@…> (22/06/2011 18:15:08)
Message:

fixed ifram sizes in embed string

Location:
telemeta
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • telemeta/htdocs/css/player.css

    rc5ddeaf r59a51a3  
    9696 
    9797#player_maximized .embed_player_frame, #player_minimized .embed_player_frame { 
    98     float: left; 
     98    float: right; 
    9999    font-weight: bold; 
    100100    color: #6A0307; 
    101101    text-decoration: none; 
    102102    font-size: 50%; 
    103     -moz-border-radius: 1ex; 
     103    padding-left: 2ex; 
     104    padding-right: 2ex; 
     105    /*-moz-border-radius: 1ex; 
    104106    -webkit-border-radius: 1ex; 
    105107    border-radius: 1ex; 
    106108    border: 1px solid #ddd; 
    107     padding-left: 2ex; 
    108     padding-right: 2ex; 
    109109    background-color: #fff; 
     110     
     111    */ 
     112     position: relative; 
     113    top: -1px; 
    110114    line-height: 1.5em; 
    111     position: relative; 
    112     top: -2px; 
     115    
    113116} 
    114117 
  • telemeta/htdocs/js/playerLoader.js

    ra36128d r59a51a3  
    495495                        var size= player.getImageSize(); 
    496496                        player_url += "/player/"+size.width+"x"+size.height; 
    497                         var input_text = "<iframe width='"+size.width+"' height='"+size.height+ 
     497                        var iframeSpanW = 15; 
     498                        var iframeSpanH = 85; 
     499                        var input_text = "<iframe width='"+(size.width+iframeSpanW)+"' height='"+(size.height+iframeSpanH)+ 
    498500                            "' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src='"+ 
    499501                            player_url+"'></iframe>"; 
     
    505507                        var p = new PopupDiv({ 
    506508                            invoker: $J(this), 
    507                             title: gettrans('Paste HTML to embed in website'), 
     509                            title: gettrans('Paste HTML to embed player in website'), 
    508510                            content: ipt, 
    509511                            defaultCloseOperation:'remove', 
  • telemeta/templates/telemeta_default/mediaitem_detail.html

    ra36128d r59a51a3  
    9494    {% if public_access or user.is_staff or user.is_superuser %} 
    9595    <div id="player_maximized" class="ts-skin-lab"> 
     96        <a href="#" class="toggle">Minimize</a> 
    9697        <a href="#" class="embed_player_frame">&lt;/&gt;</a> 
    97         <a href="#" class="toggle">Minimize</a> 
    9898        <div class="wazing"></div> 
    9999    </div> 
    100100    <div id="rightcol"> 
    101101        <div id="player_minimized" class="ts-skin-lab"> 
     102            <a href="#" class="toggle">Maximize</a> 
    102103            <a href="#" class="embed_player_frame">&lt;/&gt;</a> 
    103             <a href="#" class="toggle">Maximize</a> 
    104104            <div class="wazing"></div> 
    105105            <div id="player" class="ts-player"> 
     
    265265{% if user.is_authenticated and perms.telemeta.delete_mediaitem %} 
    266266<div style="float: right;"> 
    267  <a href="#" onclick="if(confirm(gettrans('delete the marker permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"  class="component_icon button icon_delete">{% trans "Delete" %}</a> 
     267 <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"  class="component_icon button icon_delete">{% trans "Delete" %}</a> 
    268268</div> 
    269269{% endif %} 
Note: See TracChangeset for help on using the changeset viewer.