Merge remote-tracking branch 'audio/fix-audio-icon' into master
This commit is contained in:
		
						commit
						14bc345883
					
				| 
						 | 
					@ -65,7 +65,7 @@
 | 
				
			||||||
            {% endif %}
 | 
					            {% endif %}
 | 
				
			||||||
          {% endfor %}
 | 
					          {% endfor %}
 | 
				
			||||||
          {% for format in entry.data %}
 | 
					          {% for format in entry.data %}
 | 
				
			||||||
            {% if format.format|lower == 'mp3' %}
 | 
					            {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
 | 
				
			||||||
            <span class="glyphicon glyphicon-music"></span>
 | 
					            <span class="glyphicon glyphicon-music"></span>
 | 
				
			||||||
            {% endif %}
 | 
					            {% endif %}
 | 
				
			||||||
          {% endfor %}
 | 
					          {% endfor %}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -104,7 +104,7 @@
 | 
				
			||||||
            {% endif %}
 | 
					            {% endif %}
 | 
				
			||||||
          {% endfor %}
 | 
					          {% endfor %}
 | 
				
			||||||
          {% for format in entry.data %}
 | 
					          {% for format in entry.data %}
 | 
				
			||||||
            {% if format.format|lower == 'mp3' %}
 | 
					            {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
 | 
				
			||||||
            <span class="glyphicon glyphicon-music"></span>
 | 
					            <span class="glyphicon glyphicon-music"></span>
 | 
				
			||||||
            {% endif %}
 | 
					            {% endif %}
 | 
				
			||||||
          {%endfor%}
 | 
					          {%endfor%}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -67,7 +67,7 @@
 | 
				
			||||||
            {% endif %}
 | 
					            {% endif %}
 | 
				
			||||||
          {% endfor %}
 | 
					          {% endfor %}
 | 
				
			||||||
          {% for format in entry.data %}
 | 
					          {% for format in entry.data %}
 | 
				
			||||||
            {% if format.format|lower == 'mp3' %}
 | 
					            {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
 | 
				
			||||||
            <span class="glyphicon glyphicon-music"></span>
 | 
					            <span class="glyphicon glyphicon-music"></span>
 | 
				
			||||||
            {% endif %}
 | 
					            {% endif %}
 | 
				
			||||||
          {% endfor %}
 | 
					          {% endfor %}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -293,6 +293,7 @@ def edit_required(f):
 | 
				
			||||||
def before_request():
 | 
					def before_request():
 | 
				
			||||||
    if current_user.is_authenticated:
 | 
					    if current_user.is_authenticated:
 | 
				
			||||||
        confirm_login()
 | 
					        confirm_login()
 | 
				
			||||||
 | 
					    g.constants = constants
 | 
				
			||||||
    g.user = current_user
 | 
					    g.user = current_user
 | 
				
			||||||
    g.allow_registration = config.config_public_reg
 | 
					    g.allow_registration = config.config_public_reg
 | 
				
			||||||
    g.allow_anonymous = config.config_anonbrowse
 | 
					    g.allow_anonymous = config.config_anonbrowse
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user