Header and rendering / formatting tidy-up Change-Id: I9a84c5e5f68bbcf7c1abdc253640d78f747c3b2e
diff --git a/github-plugin/src/main/resources/static/account.html b/github-plugin/src/main/resources/static/account.html index f9a8c68..52654f1 100644 --- a/github-plugin/src/main/resources/static/account.html +++ b/github-plugin/src/main/resources/static/account.html
@@ -43,15 +43,15 @@ <ul> <li><label for="username">Username:</label> <input maxlength="50" id="username" name="username" type="text" - value="$myself.login" readonly="readonly" /> + 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> + value="$!myself.name" readonly="readonly" /></li> <li><label for="eMail">e-Mail:</label> - <input maxlength="50" value="$myself.email" type="text" name="email" readonly="readonly" /></li> + <input maxlength="50" value="$!myself.email" type="text" name="email" readonly="readonly" /></li> </ul> <h5>Import GitHub SSH Public Keys</h5>
diff --git a/github-plugin/src/main/resources/static/js/pullrequests.js b/github-plugin/src/main/resources/static/js/pullrequests.js index 1fdee28..4e347aa 100644 --- a/github-plugin/src/main/resources/static/js/pullrequests.js +++ b/github-plugin/src/main/resources/static/js/pullrequests.js
@@ -172,7 +172,7 @@ '<p class="body">' + req.body + '</p>' + '<p class="author">by ' + req.author + '</p>', '<p class="timestamp">' + req.date + '</p>', - '<select name="' + paramPrefix + '.type" id="importtype"><option>Squash</option><option>Commits</option> </select>' + + '<select name="' + paramPrefix + '.type" id="importtype"><option>Commits</option> </select>' + '<span id="status_' + idx + '" class="status" ></span>' + '<label id="status_description_' + idx + '" class="synch-status">' ] );
diff --git a/github-plugin/src/main/resources/static/pullrequests.html b/github-plugin/src/main/resources/static/pullrequests.html index 883b0ed..f8da4c1 100644 --- a/github-plugin/src/main/resources/static/pullrequests.html +++ b/github-plugin/src/main/resources/static/pullrequests.html
@@ -15,7 +15,7 @@ <div class="page-title"> <div> <h2> - Import Pull Requests for Review + <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"> @@ -71,8 +71,7 @@ <th scope="col" >Timestamp</th> <th scope="col" > <select id="importtype"> - <option selected="selected">Squash</option> - <option>Commits</option> + <option selected="selected">Commits</option> </select> </th> </tr>
diff --git a/github-plugin/src/main/resources/static/repositories.html b/github-plugin/src/main/resources/static/repositories.html index 752a737..84b92fd 100644 --- a/github-plugin/src/main/resources/static/repositories.html +++ b/github-plugin/src/main/resources/static/repositories.html
@@ -15,8 +15,8 @@ <div class="page-title"> <div> <h2> - <a href="account.html">Account profile</a> > Repositories - replication + <a href="account.html">Account </a> > Repositories + Replication </h2> <div class="right"> <button type="button" id="cancel"> @@ -36,7 +36,7 @@ <!--div.container start --> <div class="container"> <div class="center"> - <form id="repositories" action="repositories-next.gh" method="get" + <form id="repositories" action="repositories-next.gh" method="post" class="signupform"> <h5> Select GitHub repositories to clone and replicate