From 0712926b8476950d2aa50e7c3993b6225f0db595 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Wed, 1 Mar 2017 09:02:15 -0800
Subject: [PATCH] templates: Rename right-sidebar.html to right_sidebar.html.

---
 templates/zerver/index.html                                 | 2 +-
 templates/zerver/{right-sidebar.html => right_sidebar.html} | 0
 tools/check-templates                                       | 2 +-
 tools/html-grep                                             | 2 +-
 zerver/tests/test_templates.py                              | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename templates/zerver/{right-sidebar.html => right_sidebar.html} (100%)

diff --git a/templates/zerver/index.html b/templates/zerver/index.html
index 25724b4ee4..10df403fed 100644
--- a/templates/zerver/index.html
+++ b/templates/zerver/index.html
@@ -118,7 +118,7 @@ var page_params = {{ page_params }};
         </div><!--/tab-content-->
     </div>
     <div class="column-right">
-          {% include "zerver/right-sidebar.html" %}
+          {% include "zerver/right_sidebar.html" %}
     </div><!--/right sidebar-->
     {% include "zerver/image-overlay.html" %}
     {% include "zerver/subscriptions.html" %}
diff --git a/templates/zerver/right-sidebar.html b/templates/zerver/right_sidebar.html
similarity index 100%
rename from templates/zerver/right-sidebar.html
rename to templates/zerver/right_sidebar.html
diff --git a/tools/check-templates b/tools/check-templates
index 43152e5f45..66f15db546 100755
--- a/tools/check-templates
+++ b/tools/check-templates
@@ -130,7 +130,7 @@ def check_html_templates(templates, modified_only, all_dups):
             'templates/zerver/login.html',
             'templates/zerver/markdown_help.html',
             'templates/zerver/register.html',
-            'templates/zerver/right-sidebar.html',
+            'templates/zerver/right_sidebar.html',
             'templates/zerver/search_operators.html',
 
             'zerver/webhooks/deskdotcom/doc.html',
diff --git a/tools/html-grep b/tools/html-grep
index d1818c6c7a..22599d4ede 100755
--- a/tools/html-grep
+++ b/tools/html-grep
@@ -19,7 +19,7 @@ USAGE = '''
     Example:
 
         $ ./tools/html-grep '#group-pms' '.filters'
-        templates/zerver/right-sidebar.html 45
+        templates/zerver/right_sidebar.html 45
 
             div.right-sidebar#right-sidebar
                 div#group-pm-list
diff --git a/zerver/tests/test_templates.py b/zerver/tests/test_templates.py
index d1aa47175b..0b0fb0571b 100644
--- a/zerver/tests/test_templates.py
+++ b/zerver/tests/test_templates.py
@@ -71,7 +71,7 @@ class TemplateTestCase(ZulipTestCase):
             'zerver/logout.html',
             'zerver/markdown_help.html',
             'zerver/navbar.html',
-            'zerver/right-sidebar.html',
+            'zerver/right_sidebar.html',
             'zerver/search_operators.html',
             'zerver/settings_overlay.html',
             'zerver/settings_sidebar.html',