Fix some templates

templates/file-view.html

@@ -56,11 +56,11 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            56  
                                            {% elif mode == "audio" %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            57  
                                                <audio controls src="{{ file }}" style="width: 100%;">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            58  
                                                    {% trans %}Your browser does not support HTML5 multimedia.{% endtrans %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        59 -
                                                <a href="{{ file }">{% trans %}Download file{% endtrans %}</a>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        59 +
                                                <a href="{{ file }}">{% trans %}Download file{% endtrans %}</a>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            60  
                                                </audio>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            61  
                                            {% elif mode == "video" %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            62  
                                                <video controls src="{{ file }}" style="width: 100%;">
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            63  
                                                    {% trans %}Your browser does not support HTML5 multimedia.{% endtrans %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        64 -
                                                <a href="{{ file }">{% trans %}Download file{% endtrans %}</a>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        64 +
                                                <a href="{{ file }}">{% trans %}Download file{% endtrans %}</a>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            65  
                                                </video>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            66  
                                            {% endif %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                            
                                

templates/task-monitor.html

@@ -39,10 +39,10 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            39  
                                                            </p>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            40  
                                                            {% if result.get()[3] != result.get()[5] %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            41  
                                                                <pre>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        42 -
                                        <span class="decorative-dollar">{% trans %}git remote add UPSTREAM {{ result.get()[3] }}{% endtrans %}</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        43 -
                                        <span class="decorative-dollar">{% trans %}git remote update{% endtrans %}</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        44 -
                                        <span class="decorative-dollar">{% trans %}git checkout {{ result.get()[6] }}{% endtrans %}</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        45 -
                                        <span class="decorative-dollar">{% trans %}git merge --allow-unrelated-histories UPSTREAM/{{ result.get()[4] }}{% endtrans %}</span></pre>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        42 +
                                        <span class="decorative-dollar">git remote add UPSTREAM {{ result.get()[3] }}</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        43 +
                                        <span class="decorative-dollar">git remote update</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        44 +
                                        <span class="decorative-dollar">git checkout {{ result.get()[6] }}</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        45 +
                                        <span class="decorative-dollar">git merge --allow-unrelated-histories UPSTREAM/{{ result.get()[4] }}</span></pre>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            46  
                                                                <p>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            47  
                                                                    {% trans %}Then fix your conflicts, merge, and finally, run:{% endtrans %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            48  
                                                                </p>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -53,8 +53,8 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            53  
                                                                </p>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            54  
                                                            {% else %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            55  
                                                                <pre>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        56 -
                                        <span class="decorative-dollar">{% trans %}git checkout {{ result.get()[6] }}{% endtrans %}</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        57 -
                                        <span class="decorative-dollar">{% trans %}git merge {{ result.get()[4] }}{% endtrans %}</span></pre>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        56 +
                                        <span class="decorative-dollar">git checkout {{ result.get()[6] }}</span>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        57 +
                                        <span class="decorative-dollar">git merge {{ result.get()[4] }}</span></pre>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            58  
                                                                <p>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            59  
                                                                    {% trans %}Resolve your conflicts and merge, then push.{% endtrans %}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            60  
                                                                </p>