Removed various unnecessary instances of mark_safe applied to URLs

from django.contrib.admin.util import quote

from django.utils.translation import ugettext_lazy as _

from django.utils.encoding import smart_unicode

from django.utils.safestring import mark_safe

ADDITION = 1

CHANGE = 2

        This is relative to the Django admin index page.

        """

        if self.content_type and self.object_id:

            return mark_safe("%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, quote(self.object_id)))

            return "%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, quote(self.object_id))

        return None

            'has_file_field': True, # FIXME - this should check if form or formsets have a FileField,

            'has_absolute_url': hasattr(self.model, 'get_absolute_url'),

            'ordered_objects': ordered_objects,

            'form_url': mark_safe(form_url),

            'form_url': form_url,

            'opts': opts,

            'content_type_id': ContentType.objects.get_for_model(self.model).id,

            'save_as': self.save_as,

{% endblocktrans %}

<div id="content-main">

    <h3><a href="javascript:(function(){if(typeof ActiveXObject!='undefined'){x=new ActiveXObject('Microsoft.XMLHTTP')}else if(typeof XMLHttpRequest!='undefined'){x=new XMLHttpRequest()}else{return;}x.open('HEAD',location.href,false);x.send(null);try{view=x.getResponseHeader('x-view');}catch(e){alert('No view found for this page');return;}if(view=='undefined'){alert('No view found for this page');}document.location='{{ admin_url }}doc/views/'+view+'/';})()">{% trans "Documentation for this page" %}</a></h3>

    <h3><a href="javascript:(function(){if(typeof ActiveXObject!='undefined'){x=new ActiveXObject('Microsoft.XMLHTTP')}else if(typeof XMLHttpRequest!='undefined'){x=new XMLHttpRequest()}else{return;}x.open('HEAD',location.href,false);x.send(null);try{view=x.getResponseHeader('x-view');}catch(e){alert('No view found for this page');return;}if(view=='undefined'){alert('No view found for this page');}document.location='{{ admin_url|escapejs }}doc/views/'+view+'/';})()">{% trans "Documentation for this page" %}</a></h3>

    <p>{% trans "Jumps you from any page to the documentation for the view that generates that page." %}</p>

    <h3><a href="javascript:(function(){if(typeof ActiveXObject!='undefined'){x=new ActiveXObject('Microsoft.XMLHTTP')}else if(typeof XMLHttpRequest!='undefined'){x=new XMLHttpRequest()}else{return;}x.open('GET',location.href,false);x.send(null);try{type=x.getResponseHeader('x-object-type');id=x.getResponseHeader('x-object-id');}catch(e){type='(none)';id='(none)';}d=document;b=d.body;e=d.createElement('div');e.id='xxxhhh';s=e.style;s.position='absolute';s.left='10px';s.top='10px';s.font='10px monospace';s.border='1px black solid';s.padding='4px';s.backgroundColor='#eee';e.appendChild(d.createTextNode('Type: '+type));e.appendChild(d.createElement('br'));e.appendChild(d.createTextNode('ID: '+id));e.appendChild(d.createElement('br'));l=d.createElement('a');l.href='#';l.onclick=function(){b.removeChild(e);};l.appendChild(d.createTextNode('[close]'));l.style.textDecoration='none';e.appendChild(l);b.appendChild(e);})();">{% trans "Show object ID" %}</a></h3>

    admin_root = urlresolvers.reverse('admin:index')

    return render_to_response('admin_doc/bookmarklets.html', {

        'root_path': admin_root,

        'admin_url': mark_safe("%s://%s%s" % (request.is_secure() and 'https' or 'http', request.get_host(), admin_root)),

        'admin_url': "%s://%s%s" % (request.is_secure() and 'https' or 'http', request.get_host(), admin_root),

    }, context_instance=RequestContext(request))

@staff_member_required

        context = {

            'title': _('Change password: %s') % escape(user.username),

            'adminForm': adminForm,

            'form_url': mark_safe(form_url),

            'form_url': form_url,

            'form': form,

            'is_popup': '_popup' in request.REQUEST,

            'add': True,