Merge branch 'master' into skins

1 files changed, 17 insertions, 17 deletions

diff --git a/forum/templates/authopenid/signin.html b/forum/templates/authopenid/signin.html
index aacdd490..679253da 100755
--- a/forum/templates/authopenid/signin.html
+++ b/forum/templates/authopenid/signin.html
@@ -4,10 +4,10 @@
 {% load extra_tags %}

 {% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %}

 {% block forejs %}

-    <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>

+    <script type='text/javascript' src='{% media  "/content/js/jquery.validate.pack.js" %}'></script>

 

-	<link rel="stylesheet" type="text/css" media="screen" href="{% href "/content/jquery-openid/openid.css" %}"/>

-	<script type="text/javascript" src="{% href "/content/jquery-openid/jquery.openid.js" %}"></script>

+	<link rel="stylesheet" type="text/css" media="screen" href="{% media  "/content/jquery-openid/openid.css" %}"/>

+	<script type="text/javascript" src="{% media  "/content/jquery-openid/jquery.openid.js" %}"></script>

 	<script type="text/javascript">  $().ready( function() { $("form.openid:eq(0)").openid(); })</script>

 	<!--<script type="text/javascript">

 	$().ready(function(){

@@ -44,23 +44,23 @@
 			  <ul class="providers"> 

 			  <li class="local" title="Local login">

 				  <div class="logo_box local_login_box">

-						<img src="{% href "/content/jquery-openid/images/local-login.png" %}" alt="your icon here" /> 

+						<img src="{% media  "/content/jquery-openid/images/local-login.png" %}" alt="your icon here" /> 

 				  </div>

 			  <span></span>

 			  </li> 

 			  <li class="direct" title="Google"> 

 			  	<div class="logo_box google_box">

-					<img src="{% href "/content/jquery-openid/images/google.gif" %}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>

+					<img src="{% media  "/content/jquery-openid/images/google.gif" %}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>

 				</div>

 		 	  </li>

 			  <li class="direct" title="Yahoo"> 

 			  	<div class="logo_box yahoo_box">

-					<img src="{% href "/content/jquery-openid/images/yahoo.gif" %}" alt="icon" /><span>http://yahoo.com/</span>

+					<img src="{% media  "/content/jquery-openid/images/yahoo.gif" %}" alt="icon" /><span>http://yahoo.com/</span>

 				</div>

 			  </li>

 			  <li class="username" title="AOL screen name"> 

 			  	<div class="logo_box aol_box">

-					<img src="{% href "/content/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>

+					<img src="{% media  "/content/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>

 				</div>

 			  </li>

               </ul>            

@@ -83,43 +83,43 @@
                     {% endif %}                    

               </li>

 			  <li class="openid" title="OpenID URL"> 

-					<img src="{% href "/content/jquery-openid/images/openidico16.png" %}" alt="icon" />

+					<img src="{% media  "/content/jquery-openid/images/openidico16.png" %}" alt="icon" />

 					<span>http://{your-openid-url}</span>

 		      </li> 

 			  <li class="username" title="MyOpenID user name"> 

-					<img src="{% href "/content/jquery-openid/images/myopenid-2.png" %}" alt="icon" />

+					<img src="{% media  "/content/jquery-openid/images/myopenid-2.png" %}" alt="icon" />

 					<span>http://<strong>username</strong>.myopenid.com/</span>

 		      </li> 

 			  <li class="username" title="Flickr user name"> 

-					<img src="{% href "/content/jquery-openid/images/flickr.png" %}" alt="icon" />

+					<img src="{% media  "/content/jquery-openid/images/flickr.png" %}" alt="icon" />

 					<span>http://flickr.com/<strong>username</strong>/</span>

 			  </li> 

 			  <li class="username" title="Technorati user name"> 

-					<img src="{% href "/content/jquery-openid/images/technorati-1.png" %}" alt="icon" />

+					<img src="{% media  "/content/jquery-openid/images/technorati-1.png" %}" alt="icon" />

 					<span>http://technorati.com/people/technorati/<strong>username</strong>/</span>

 			  </li> 

 			  <li class="username" title="Wordpress blog name"> 

-					<img src="{% href "/content/jquery-openid/images/wordpress.png" %}" alt="icon" />

+					<img src="{% media  "/content/jquery-openid/images/wordpress.png" %}" alt="icon" />

 					<span>http://<strong>username</strong>.wordpress.com</span>

               </li> 

 			  <li class="username" title="Blogger blog name"> 

-					<img src="{% href "/content/jquery-openid/images/blogger-1.png" %}" alt="icon" />

+					<img src="{% media  "/content/jquery-openid/images/blogger-1.png" %}" alt="icon" />

 					<span>http://<strong>username</strong>.blogspot.com/</span>

 			  </li> 

 			  <li class="username" title="LiveJournal blog name"> 

-					<img src="{% href "/content/jquery-openid/images/livejournal-1.png" %}" alt="icon" />

+					<img src="{% media  "/content/jquery-openid/images/livejournal-1.png" %}" alt="icon" />

 					<span>http://<strong>username</strong>.livejournal.com</span>

 			  </li> 

 			  <li class="username" title="ClaimID user name"> 

-					<img src="{% href "/content/jquery-openid/images/claimid-0.png" %}" alt="icon" />

+					<img src="{% media  "/content/jquery-openid/images/claimid-0.png" %}" alt="icon" />

 					<span>http://claimid.com/<strong>username</strong></span>

 			  </li> 

 			  <li class="username" title="Vidoop user name"> 

-					<img src="{% href "/content/jquery-openid/images/vidoop.png" %}" alt="icon" />

+					<img src="{% media  "/content/jquery-openid/images/vidoop.png" %}" alt="icon" />

 					<span>http://<strong>username</strong>.myvidoop.com/</span>

 			  </li> 

 			  <li class="username" title="Verisign user name"> 

-					<img src="{% href "/content/jquery-openid/images/verisign-2.png" %}" alt="icon" />

+					<img src="{% media  "/content/jquery-openid/images/verisign-2.png" %}" alt="icon" />

 					<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>

 			  </li> 

 			  </ul>