Commit 119598f1 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic
Browse files

Bug 1684267: Adding changes of old raw lost in merge

behatnotneeded

Change-Id: Ia8cb67a9b92304970f4011771314745ad953a96f
parent 7dbc6870
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
<div class="blog">
    {if $alldraftposts}
        {str tag='alldraftposts' section='artefact.blog'}
    {/if}
    {if ($editing && $canaddpost)}
        <a class="panel-footer" href="{$WWWROOT}artefact/blog/post.php?blog={$blogid}">
            <span class="icon icon-plus text-success left" role="presentation" aria-hidden="true"></span>
+10 −5
Original line number Diff line number Diff line
{**
* This template displays a blog post.
*}

{if $published}
<div id="blogpost-{$postid}" class="panel-body flush">

    {if $artefacttitle && $simpledisplay}
    <h3 class="title">
    <h2 class="title">
        {$artefacttitle|safe}
    </h3>
    </h2>
    {/if}

    <div class="postdetails metadata">
@@ -40,7 +40,7 @@

    {if isset($attachments)}
        <div class="has-attachment panel panel-default collapsible">
            <h5 class="panel-heading">
            <h3 class="panel-heading">
                <a class="text-left collapsed" aria-expanded="false" href="#blog-attach-{$postid}" data-toggle="collapse">
                    <span class="icon left icon-paperclip" role="presentation" aria-hidden="true"></span>

@@ -48,7 +48,7 @@
                    <span class="metadata">({$attachments|count})</span>
                    <span class="icon icon-chevron-down pull-right collapse-indicator" role="presentation" aria-hidden="true"></span>
                </a>
            </h5>
            </h3>
            <!-- Attachment list with view and download link -->
            <div id="blog-attach-{$postid}" class="collapse">
                <ul class="list-unstyled list-group">
@@ -83,3 +83,8 @@
        </div>
    {/if}
</div>
{else}
<div>
{$notpublishedblogpost|safe}
</div>
{/if}
+2 −2
Original line number Diff line number Diff line
{if $artefacttype == 'image' || $artefacttype == 'profileicon'}
<h3 class="title">
<h2 class="title">
    {str tag=Preview section=artefact.file}
</h3>
</h2>
<div class="filedata-icon">
    <a href="{$downloadpath}">
        <img src="{$downloadpath}&maxwidth=400&maxheight=180" alt="">
+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@
            <input type="hidden" name="{$prefix}_uploadnumber" id="{$prefix}_uploadnumber" value="1"/>
            <input type="hidden" name="MAX_FILE_SIZE" value="{$phpmaxfilesize}" />
            <div id="{$prefix}_upload_messages"></div>
            <h3 class="title">{str tag='uploadfile' section='artefact.file'}</h3>
            <h2 class="title">{str tag='uploadfile' section='artefact.file'}</h2>

            <div class="row">
                {if $config.uploadagreement || $licenseform}
@@ -100,7 +100,7 @@
                        </label>

                        <span id="{$prefix}_userfile_container">
                            <input type="file" class="file"  {$accepts|safe} id="{$prefix}_userfile" name="userfile[]" multiple size="20" />
                            <input type="file" class="file"  {$accepts|safe} {if $capturedevice} capture="{$capturedevice}"{/if} id="{$prefix}_userfile" name="userfile[]" multiple size="20" />
                        </span>

                        <span id="{$prefix}_userfile_maxuploadsize" class="file-description">
@@ -108,7 +108,7 @@
                        </span>

                        {if $config.uploadagreement}
                            <script>setNodeAttribute('{$prefix}_userfile', 'disabled', true);</script>
                            <script>jQuery('#{$prefix}_userfile').prop('disabled', true);</script>
                        {/if}
                    </div>

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@
                        <span class="dull text-muted">{str tag=Submitted section=view}</span>
                    {elseif !$file->isparent}
                        {if !isset($file->can_edit) || $file->can_edit !== 0}
                        <button name="{$prefix}_edit[{$file->id}]" class="btn btn-default btn-xs" title="{str tag=edit}">
                        <button name="{$prefix}_edit[{$file->id}]" class="btn btn-default btn-xs editable" title="{str tag=edit}">
                            <span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
                            {if $file->artefacttype == 'folder'}
                                <span class="sr-only">{str tag=editfolderspecific section=artefact.file arg1=$displaytitle|escape:html|safe}</span>
Loading