From 84670f717268f4ae6e78eb20921aeadd4d5565d4 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Fri, 24 Apr 2015 21:31:00 +0000 Subject: [PATCH] Fixes #1692. Drag-and-Drop slide re-ordering no longer works in secr/proceedings. Consolidate / update JQuery-UI. Commit ready for merge. - Legacy-Id: 9554 --- ietf/secr/templates/areas/people.html | 5 +- ietf/secr/templates/drafts/authors.html | 5 +- ietf/secr/templates/drafts/edit.html | 5 +- ietf/secr/templates/groups/people.html | 5 +- .../templates/meetings/base_rooms_times.html | 5 +- ietf/secr/templates/meetings/blue_sheet.html | 1 - .../secr/templates/proceedings/recording.html | 4 +- .../templates/proceedings/upload_unified.html | 4 +- ietf/secr/templates/roles/base_roles.html | 5 +- ietf/secr/templates/roles/main.html | 5 +- .../css/jquery-ui-1.11.4.custom.css | 1225 +++++++++++++++++ .../css/jquery-ui-1.8.1.custom.css | 486 ------- static/secretariat/css/jquery-ui-modified.css | 486 ------- .../css/jquery.ui.autocomplete.css | 44 - .../css/redmond/jquery-ui-1.8.9.custom.css | 573 -------- static/secretariat/js/jquery-1.5.1.min.js | 16 - .../js/jquery-ui-1.11.4.custom.min.js | 12 + .../js/jquery-ui-1.8.1.custom.min.js | 756 ---------- static/secretariat/js/jquery-ui-1.8.9.min.js | 404 ------ static/secretariat/js/jquery.json-2.2.min.js | 31 - 20 files changed, 1255 insertions(+), 2822 deletions(-) create mode 100644 static/secretariat/css/jquery-ui-1.11.4.custom.css delete mode 100644 static/secretariat/css/jquery-ui-1.8.1.custom.css delete mode 100644 static/secretariat/css/jquery-ui-modified.css delete mode 100644 static/secretariat/css/jquery.ui.autocomplete.css delete mode 100644 static/secretariat/css/redmond/jquery-ui-1.8.9.custom.css delete mode 100644 static/secretariat/js/jquery-1.5.1.min.js create mode 100644 static/secretariat/js/jquery-ui-1.11.4.custom.min.js delete mode 100644 static/secretariat/js/jquery-ui-1.8.1.custom.min.js delete mode 100644 static/secretariat/js/jquery-ui-1.8.9.min.js delete mode 100644 static/secretariat/js/jquery.json-2.2.min.js diff --git a/ietf/secr/templates/areas/people.html b/ietf/secr/templates/areas/people.html index 232237d58..bc1e513c5 100644 --- a/ietf/secr/templates/areas/people.html +++ b/ietf/secr/templates/areas/people.html @@ -3,9 +3,8 @@ {% block title %}Areas - People{% endblock %} {% block extrahead %}{{ block.super }} - - - + + {% endblock %} diff --git a/ietf/secr/templates/drafts/authors.html b/ietf/secr/templates/drafts/authors.html index f819b6c01..ecdca86b2 100644 --- a/ietf/secr/templates/drafts/authors.html +++ b/ietf/secr/templates/drafts/authors.html @@ -3,9 +3,8 @@ {% block title %}Drafts - Authors{% endblock %} {% block extrahead %}{{ block.super }} - - - + + {% endblock %} diff --git a/ietf/secr/templates/drafts/edit.html b/ietf/secr/templates/drafts/edit.html index 777c6d0d1..2d50099e0 100644 --- a/ietf/secr/templates/drafts/edit.html +++ b/ietf/secr/templates/drafts/edit.html @@ -3,9 +3,8 @@ {% block title %}Drafts - Edit{% endblock %} {% block extrahead %}{{ block.super }} - - - + + diff --git a/ietf/secr/templates/groups/people.html b/ietf/secr/templates/groups/people.html index bc1ce7bdd..080563f54 100644 --- a/ietf/secr/templates/groups/people.html +++ b/ietf/secr/templates/groups/people.html @@ -3,9 +3,8 @@ {% block title %}Groups - People{% endblock %} {% block extrahead %}{{ block.super }} - - - + + {% endblock %} diff --git a/ietf/secr/templates/meetings/base_rooms_times.html b/ietf/secr/templates/meetings/base_rooms_times.html index 7110dcd07..176075f15 100644 --- a/ietf/secr/templates/meetings/base_rooms_times.html +++ b/ietf/secr/templates/meetings/base_rooms_times.html @@ -3,9 +3,8 @@ {% block title %}Meetings{% endblock %} {% block extrahead %}{{ block.super }} - - - + + {% endblock %} diff --git a/ietf/secr/templates/meetings/blue_sheet.html b/ietf/secr/templates/meetings/blue_sheet.html index 051994dd2..70ce38d32 100644 --- a/ietf/secr/templates/meetings/blue_sheet.html +++ b/ietf/secr/templates/meetings/blue_sheet.html @@ -3,7 +3,6 @@ {% block title %}Meetings - Blue Sheet{% endblock %} {% block extrahead %}{{ block.super }} - {% endblock %} diff --git a/ietf/secr/templates/proceedings/recording.html b/ietf/secr/templates/proceedings/recording.html index c22ccd264..338a91af5 100755 --- a/ietf/secr/templates/proceedings/recording.html +++ b/ietf/secr/templates/proceedings/recording.html @@ -3,11 +3,11 @@ {% block title %}Proceedings{% endblock %} {% block extrastyle %}{{ block.super }} - + {% endblock %} {% block extrahead %}{{ block.super }} - + {% endblock %} diff --git a/ietf/secr/templates/proceedings/upload_unified.html b/ietf/secr/templates/proceedings/upload_unified.html index 8d2c18b18..ce8953cf4 100755 --- a/ietf/secr/templates/proceedings/upload_unified.html +++ b/ietf/secr/templates/proceedings/upload_unified.html @@ -4,11 +4,11 @@ {% block title %}Proceedings{% endblock %} {% block extrastyle %}{{ block.super }} - + {% endblock %} {% block extrahead %}{{ block.super }} - + {% endblock %} diff --git a/ietf/secr/templates/roles/base_roles.html b/ietf/secr/templates/roles/base_roles.html index fc44b307a..3bada6378 100644 --- a/ietf/secr/templates/roles/base_roles.html +++ b/ietf/secr/templates/roles/base_roles.html @@ -3,9 +3,8 @@ {% block title %}Roles{% endblock %} {% block extrahead %}{{ block.super }} - - - + + {% endblock %} diff --git a/ietf/secr/templates/roles/main.html b/ietf/secr/templates/roles/main.html index ec878c0f9..893534331 100755 --- a/ietf/secr/templates/roles/main.html +++ b/ietf/secr/templates/roles/main.html @@ -3,9 +3,8 @@ {% block title %}Roles{% endblock %} {% block extrahead %}{{ block.super }} - - - + +