Consistent indentation in HTML templates Having consistent indentation makes the HTML templates easier to read, and thus easier to spot problems. - Replace tabs and change indentation level to 2 spaces. Having a mix of tabs and spaces makes it difficult to notice when the indentation is wrong. - Indent according to HTML tag nesting, which makes it easier to notice when a closing tag is missing. - Where possible, wrap lines at around 80 characters to improve the readability the files in editors and in code review. - Remove unnecessary line breaks and white space. - Add missing comments. Change-Id: I0eaddc22d0ca086edc6f89f261b5e078b334af11
diff --git a/github-plugin/src/main/resources/static/account.html b/github-plugin/src/main/resources/static/account.html index 52054e1..bb25b61 100644 --- a/github-plugin/src/main/resources/static/account.html +++ b/github-plugin/src/main/resources/static/account.html
@@ -1,88 +1,87 @@ <!DOCTYPE html> <html dir="ltr" lang="en-US"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>GitHub plugin for Gerrit Code Review - Account review</title> -#include ("static/styles.html") -#include ("static/scripts.html") -</head> -<body> - <div class="header"> - <div> - <div class="center"> - #include ("static/header.html") - <div class="page-title"> - <div> - <h2> - Account profile - </h2> - <div class="right"> - <button type="button" onclick="window.location='/'" - id="cancel"> - <span class="button"><span>Cancel</span></span> - </button> - <button type="submit" onclick="document.forms[0].submit()"> - <span class="button green"><span>Next ></span></span> - </button> - </div> - </div> - </div> - </div> - </div> - </div> - <!--div.header end --> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>GitHub plugin for Gerrit Code Review - Account review</title> + #include ("static/styles.html") + #include ("static/scripts.html") + </head> + <body> + <!-- div.header start --> + <div class="header"> + <div> + <div class="center"> + #include ("static/header.html") + <div class="page-title"> + <div> + <h2>Account profile</h2> + <div class="right"> + <button type="button" onclick="window.location='/'" id="cancel"> + <span class="button"><span>Cancel</span></span> + </button> + <button type="submit" onclick="document.forms[0].submit()"> + <span class="button green"><span>Next ></span></span> + </button> + </div> + </div> + </div> + </div> + </div> + </div> + <!-- div.header end --> - <!--div.container start --> - <div class="container"> - <div class="center"> - <form class="signupform" method="post" action="account.gh"> - <h5> - GitHub account details - </h5> - <ul> - <li><label for="username">Username:</label> <input - maxlength="50" id="username" name="username" type="text" - value="$!myself.login" readonly="readonly" /> - </li> + <!-- div.container start --> + <div class="container"> + <div class="center"> + <form class="signupform" method="post" action="account.gh"> + <h5>GitHub account details</h5> + <ul> + <li> + <label for="username">Username:</label> + <input maxlength="50" id="username" name="username" type="text" + value="$!myself.login" readonly="readonly" /> + </li> - <li><label for="lastName">Full name:</label> <input - maxlength="50" id="fullname" name="fullname" type="text" - value="$!myself.name" readonly="readonly" /></li> + <li> + <label for="lastName">Full name:</label> + <input maxlength="50" id="fullname" name="fullname" type="text" + value="$!myself.name" readonly="readonly" /> + </li> - <li><label for="eMail">e-Mail:</label> - <select id="email" name="email"> - #foreach ( $email in $myself.emails2 ) - #if ( $email.email == $!myself.email || $email.primary ) - <option selected="selected">$email.email</option> - #else - <option>$email.email</option> - #end - #end - </select> - </li> - </ul> - - <h5>Import GitHub SSH Public Keys</h5> - <ul> - #foreach ( $key in $myself.publicVerifiedKeys ) - #if ( $key.key.length() > 45 ) - <li> <label for="$key.title" style="font-weight: bold;">$key.title :</label> - #set ( $trailStart = $key.key.length() - 10 ) - <textarea - class="keyvalue" rows="1" cols="80" readonly="readonly">$key.key.substring(1,35) ... $key.key.substring($trailStart).trim()</textarea> - <input class="keycheckbox" type="checkbox" - name="key_check_$key.id" checked="checked" /> - </li> - #end + <li> + <label for="eMail">e-Mail:</label> + <select id="email" name="email"> + #foreach ( $email in $myself.emails2 ) + #if ( $email.email == $!myself.email || $email.primary ) + <option selected="selected">$email.email</option> + #else + <option>$email.email</option> + #end #end - </ul> - </form> - </div> - </div> + </select> + </li> + </ul> + + <h5>Import GitHub SSH Public Keys</h5> + <ul> + #foreach ( $key in $myself.publicVerifiedKeys ) + #if ( $key.key.length() > 45 ) + <li> + <label for="$key.title" style="font-weight: bold;">$key.title :</label> + #set ( $trailStart = $key.key.length() - 10 ) + <textarea class="keyvalue" rows="1" cols="80" readonly="readonly">$key.key.substring(1,35) ... $key.key.substring($trailStart).trim()</textarea> + <input class="keycheckbox" type="checkbox" name="key_check_$key.id" checked="checked" /> + </li> + #end + #end + </ul> + </form> + </div> + </div> <!--div.container end --> #include ("static/footer.html") - <script type='text/javascript' src='js/jquery/jquery.form.js?ver=2.02m'></script> -</body> + <script type='text/javascript' src='js/jquery/jquery.form.js?ver=2.02m'></script> + </body> </html>
diff --git a/github-plugin/src/main/resources/static/css/github-plugin.css b/github-plugin/src/main/resources/static/css/github-plugin.css index 31d73a8..f876596 100644 --- a/github-plugin/src/main/resources/static/css/github-plugin.css +++ b/github-plugin/src/main/resources/static/css/github-plugin.css
@@ -1,31 +1,31 @@ .repo-sync span.status { - width: 24px; - height: 24px; - display: inline-block; + width: 24px; + height: 24px; + display: inline-block; } .repo-sync .sync { - background-image: url("../images/spinner-24px.gif"); + background-image: url("../images/spinner-24px.gif"); } .repo-sync .failed { - background-image: url("../images/failed.png"); + background-image: url("../images/failed.png"); } .repo-sync .complete { - background-image: url("../images/done.png"); + background-image: url("../images/done.png"); } .repo-sync .cancelled { - background-image: url("../images/cancelled.png"); + background-image: url("../images/cancelled.png"); } div.loading { - margin-left: 30px; - background-image: url("../images/spinner-32px.gif"); - background-repeat: no-repeat; - padding-left: 50px; - width: 300px; - height: 40px; - display: inline-block; -} \ No newline at end of file + margin-left: 30px; + background-image: url("../images/spinner-32px.gif"); + background-repeat: no-repeat; + padding-left: 50px; + width: 300px; + height: 40px; + display: inline-block; +}
diff --git a/github-plugin/src/main/resources/static/pullrequests.html b/github-plugin/src/main/resources/static/pullrequests.html index 991236b..158a560 100644 --- a/github-plugin/src/main/resources/static/pullrequests.html +++ b/github-plugin/src/main/resources/static/pullrequests.html
@@ -1,91 +1,91 @@ <!DOCTYPE html> <html dir="ltr" lang="en-US"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>GitHub plugin for Gerrit Code Review - Pull Requests - replication</title> -#include ("static/styles.html") -#include ("static/scripts.html") -</head> -<body> - <div class="header"> - <div> - <div class="center"> - #include ("static/header.html") - <div class="page-title"> - <div> - <h2> - <a href="account.html">Account </a> > <a href="repositories.html">Repositories Replication</a> > Opened Pull Requests - </h2> - <div class="right"> - <button type="button" id="cancel"> - <span class="button"><span>Cancel</span></span> - </button> - <button type="submit" id="submit" disabled="disabled"> - <span class="button green"><span>Import selected</span></span> - </button> - </div> - </div> - </div> - </div> - </div> - </div> - <!--div.header end --> - - <!--div.container start --> - <div class="container"> - <div class="center"> - <form id="pullrequests" action="pullrequests-next.gh" method="get" class="signupform"> - <div id="repositories"> - <ul class="pullrequest-repos"> - <li> - <select id="organisation" name="organisation"> - <option selected="selected">$myself.login</option> - #foreach( $organisation in $myself.organizations ) - #if ( $request.getParameter("organisation") == $organisation.login ) - <option selected="selected">$organisation.login</option> - #else - <option>$organisation.login</option> - #end - #end - </select> - </li> - <li class="filter" style="display: none;"> - <input type="text" id="repo-filter" class="filter" name="filter" placeholder="Filter repositories" /> - </li> - </ul> - <ul class="repo-list"> - </ul> - </div> - <div id="pullrequests"> - <div class="loading"> - <p>Loading Pull Requests from GitHub ...</p> - </div> - <table class="table simple-table responsive-table responsive-table-on" style="display: none;" id="pull-requests"> - - <thead> - <tr> - <th scope="col" ><input type="checkbox" name="checkall" id="checkall" value="1" checked="checked"></th> - <th scope="col" >Id</th> - <th scope="col" >Repository / Pull request subject / Author</th> - <th scope="col" >Timestamp</th> - <th scope="col" > - <select id="importtype"> - <option selected="selected">Commits</option> - </select> - </th> - </tr> - </thead> - <tbody> - </tbody> - </table> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>GitHub plugin for Gerrit Code Review - Pull Requests replication</title> + #include ("static/styles.html") + #include ("static/scripts.html") + </head> + <body> + <!-- div.header start --> + <div class="header"> + <div> + <div class="center"> + #include ("static/header.html") + <div class="page-title"> + <div> + <h2> + <a href="account.html">Account </a> > <a href="repositories.html">Repositories Replication</a> > Opened Pull Requests + </h2> + <div class="right"> + <button type="button" id="cancel"> + <span class="button"><span>Cancel</span></span> + </button> + <button type="submit" id="submit" disabled="disabled"> + <span class="button green"><span>Import selected</span></span> + </button> + </div> </div> - </form> - </div> - </div> + </div> + </div> + </div> + </div> + <!-- div.header end --> + + <!--div.container start --> + <div class="container"> + <div class="center"> + <form id="pullrequests" action="pullrequests-next.gh" method="get" class="signupform"> + <div id="repositories"> + <ul class="pullrequest-repos"> + <li> + <select id="organisation" name="organisation"> + <option selected="selected">$myself.login</option> + #foreach( $organisation in $myself.organizations ) + #if ( $request.getParameter("organisation") == $organisation.login ) + <option selected="selected">$organisation.login</option> + #else + <option>$organisation.login</option> + #end + #end + </select> + </li> + <li class="filter" style="display: none;"> + <input type="text" id="repo-filter" class="filter" name="filter" placeholder="Filter repositories" /> + </li> + </ul> + <ul class="repo-list"> + </ul> + </div> + <div id="pullrequests"> + <div class="loading"> + <p>Loading Pull Requests from GitHub ...</p> + </div> + <table class="table simple-table responsive-table responsive-table-on" style="display: none;" id="pull-requests"> + <thead> + <tr> + <th scope="col" ><input type="checkbox" name="checkall" id="checkall" value="1" checked="checked"></th> + <th scope="col" >Id</th> + <th scope="col" >Repository / Pull request subject / Author</th> + <th scope="col" >Timestamp</th> + <th scope="col" > + <select id="importtype"> + <option selected="selected">Commits</option> + </select> + </th> + </tr> + </thead> + <tbody> + </tbody> + </table> + </div> + </form> + </div> + </div> + <!--div.container end --> + <script type='text/javascript' src='js/pullrequests.js'></script> - <!--div.container end --> - #include ("static/footer.html") -</body> -</html> \ No newline at end of file + #include ("static/footer.html") + </body> +</html>
diff --git a/github-plugin/src/main/resources/static/repositories.html b/github-plugin/src/main/resources/static/repositories.html index 7713950..e4cd855 100644 --- a/github-plugin/src/main/resources/static/repositories.html +++ b/github-plugin/src/main/resources/static/repositories.html
@@ -1,88 +1,83 @@ <!DOCTYPE html> <html dir="ltr" lang="en-US"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>GitHub plugin for Gerrit Code Review - Repositories - replication</title> -#include ("static/styles.html") -#include ("static/scripts.html") -</head> -<body> - <div class="header"> - <div> - <div class="center"> - #include ("static/header.html") - <div class="page-title"> - <div> - <h2> - <a href="account.html">Account </a> > Repositories - Replication - </h2> - <div class="right"> - <button type="button" id="cancel"> - <span class="button"><span>Cancel</span></span> - </button> - <button type="submit" id="submit" disabled="disabled"> - <span class="button green"><span>Accept ></span></span> - </button> - </div> - </div> - </div> - </div> - </div> - </div> - <!--div.header end --> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>GitHub plugin for Gerrit Code Review - Repositories replication</title> + #include ("static/styles.html") + #include ("static/scripts.html") + </head> + <body> + <!-- div.header start --> + <div class="header"> + <div> + <div class="center"> + #include ("static/header.html") + <div class="page-title"> + <div> + <h2><a href="account.html">Account </a> > Repositories Replication </h2> + <div class="right"> + <button type="button" id="cancel"> + <span class="button"><span>Cancel</span></span> + </button> + <button type="submit" id="submit" disabled="disabled"> + <span class="button green"><span>Accept ></span></span> + </button> + </div> + </div> + </div> + </div> + </div> + </div> + <!--div.header end --> - <!--div.container start --> - <div class="container"> - <div class="center"> - <form id="repositories" action="repositories-next.gh" method="post" - class="signupform"> - <h5> - Select GitHub repositories to clone and replicate - </h5> - <ul class="repo-sync-header"> - <li> - <input class="keycheckbox" type="checkbox" id="selectallcheckbox" checked="checked"/> - <select id="organisation" name="organisation"> - <option selected="selected">$myself.login</option> - #foreach( $organisation in $myself.allOrganizations ) - <option>$organisation.login</option> - #end - </select><label class="repository"> / Repository name</label> - <label class="rows">Rows</label> - <select id="numitems"> - <option>10</option> - <option>50</option> - <option>100</option> - </select> - <input type="text" id="filter" class="filter" name="filter" placeholder="Filter by name" /> - </li> - </ul> - <div class="loading"> - <p>Loading list of GitHub repositories ...</p> - </div> - <ul class="repo-sync"> - </ul> - <script type="text/template" id="repo-sync-template"> - <li> - <input class="keycheckbox" type="checkbox" name="repo_<%= index %>" /> - <span class="private_<%= repo.private %>"><%= repo.private ? "PRIVATE":"PUBLIC" %></span> - <label class="repository"><%= repo.organisation %> / <b><%= repo.name %></b></label> - <input type="hidden" name="repo_<%= index %>_organisation" value="<%= repo.organisation %>" /> - <input type="hidden" class="name" name="repo_<%= index %>_repository" value="<%= repo.name %>" /> - <input type="hidden" name="repo_<%= index %>_description" value="<%= repo.description %>" /> - <span id="status_<%= index %>" class="status" style="visibility: hidden;"></span> - <label id="repo_<%= index %>" class="synch-status"></label> - </li> - </script> - </form> - </div> - </div> - <script type='text/javascript' src='js/repositories.js'></script> + <!--div.container start --> + <div class="container"> + <div class="center"> + <form id="repositories" action="repositories-next.gh" method="post" class="signupform"> + <h5>Select GitHub repositories to clone and replicate</h5> + <ul class="repo-sync-header"> + <li> + <input class="keycheckbox" type="checkbox" id="selectallcheckbox" checked="checked"/> + <select id="organisation" name="organisation"> + <option selected="selected">$myself.login</option> + #foreach( $organisation in $myself.allOrganizations ) + <option>$organisation.login</option> + #end + </select> + <label class="repository"> / Repository name</label> + <label class="rows">Rows</label> + <select id="numitems"> + <option>10</option> + <option>50</option> + <option>100</option> + </select> + <input type="text" id="filter" class="filter" name="filter" placeholder="Filter by name" /> + </li> + </ul> + <div class="loading"> + <p>Loading list of GitHub repositories ...</p> + </div> + <ul class="repo-sync"> + </ul> + <script type="text/template" id="repo-sync-template"> + <li> + <input class="keycheckbox" type="checkbox" name="repo_<%= index %>" /> + <span class="private_<%= repo.private %>"><%= repo.private ? "PRIVATE":"PUBLIC" %></span> + <label class="repository"><%= repo.organisation %> / <b><%= repo.name %></b></label> + <input type="hidden" name="repo_<%= index %>_organisation" value="<%= repo.organisation %>" /> + <input type="hidden" class="name" name="repo_<%= index %>_repository" value="<%= repo.name %>" /> + <input type="hidden" name="repo_<%= index %>_description" value="<%= repo.description %>" /> + <span id="status_<%= index %>" class="status" style="visibility: hidden;"></span> + <label id="repo_<%= index %>" class="synch-status"></label> + </li> + </script> + </form> + </div> + </div> + <!-- div.container end --> + <script type='text/javascript' src='js/repositories.js'></script> - <!--div.container end --> - #include ("static/footer.html") -</body> -</html> \ No newline at end of file + #include ("static/footer.html") + </body> +</html>
diff --git a/github-plugin/src/main/resources/static/scripts.html b/github-plugin/src/main/resources/static/scripts.html index f7b790d..1949eff 100644 --- a/github-plugin/src/main/resources/static/scripts.html +++ b/github-plugin/src/main/resources/static/scripts.html
@@ -1,7 +1,7 @@ <!-- Include here all the additional JavaScript you may want to use for giving a more dynamic UX for the GitHub plugin. - --> +--> <script type='text/javascript' src='js/jquery-1.10.2.min.js'></script> <script type='text/javascript' src='js/jquery.cookie.min.js?ver=3.0'></script> <script src="js/datatables/jquery.datatables.min.js"></script>
diff --git a/github-plugin/src/main/resources/static/styles.html b/github-plugin/src/main/resources/static/styles.html index 0af99d0..6d9ecdc 100644 --- a/github-plugin/src/main/resources/static/styles.html +++ b/github-plugin/src/main/resources/static/styles.html
@@ -1,5 +1,4 @@ <!-- Include here all CSS styles for the L&F of the GitHub plugin - --> - <link href="css/github-plugin.css" rel="stylesheet" type="text/css" media="all" /> - +--> +<link href="css/github-plugin.css" rel="stylesheet" type="text/css" media="all" />