LoCo Team Portal

Merge lp:~effie-jayx/loco-team-portal/exit-jquery-for-now into lp:~ltp-devs/loco-team-portal/0.1

  1. exit-jquery-for-now
  2. Merge into 0.1
Proposed by Efrain Valles
Status: Merged
Merge reported by: Daniel Holbach
Merged at revision: not available
Proposed branch: lp:~effie-jayx/loco-team-portal/exit-jquery-for-now
Merge into: lp:~ltp-devs/loco-team-portal/0.1
Diff against target: None lines
To merge this branch: bzr merge lp:~effie-jayx/loco-team-portal/exit-jquery-for-now
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Christophe Sauthier Pending
LoCo Team Portal Developers Pending
Review via email: mp+8184@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Efrain Valles (effie-jayx) wrote :

This branch intends to remove jquery bits for now, as there is not usable yet.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'loco_directory/media/js'
2=== removed file 'loco_directory/media/js/hide.js'
3--- loco_directory/media/js/hide.js 2009-06-28 17:10:39 +0000
4+++ loco_directory/media/js/hide.js 1970-01-01 00:00:00 +0000
5@@ -1,7 +0,0 @@
6-$(document).ready(function(){
7-
8- $(".box .delete").click(function(){
9- $(this).parents(".box").animate({ opacity: 'hide' }, "slow");
10- });
11-
12-});
13\ No newline at end of file
14
15=== modified file 'loco_directory/templates/base.html'
16--- loco_directory/templates/base.html 2009-06-28 17:10:39 +0000
17+++ loco_directory/templates/base.html 2009-07-03 13:37:51 +0000
18@@ -5,10 +5,6 @@
19 <head>
20 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
21 <title>{% block title %} {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}</title>
22- {% block js %}
23- <script type="text/javascript" src="/media/js/jquery.js"></script>
24- <script src="/media/js/hide.js" type="text/javascript"></script>
25- {% endblock %}
26 <link rel="stortcut icon" href="/media/img/favicon.ico" type="image/x-icon" />
27 <style type="text/css" media="all">@import "/media/css/style.css";</style>
28 <link rel="stylesheet" href="/media/css/teams.css" type="text/css" media="screen" />

Subscribers

People subscribed via source and target branches