This is an automated email from the ASF dual-hosted git repository. dill0wn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/allura.git
commit 84b08441ddedca52d709e1abb8647d2fd004c696 Author: Guillermo Cruz <[email protected]> AuthorDate: Sun Dec 12 15:22:24 2021 -0700 8403 added two new subtitles and improvements to the form, updated error message when project is not available in GH --- ForgeImporters/forgeimporters/github/__init__.py | 2 +- .../forgeimporters/github/templates/project.html | 18 +++++++++++++----- .../forgeimporters/templates/project_base.html | 1 - 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ForgeImporters/forgeimporters/github/__init__.py b/ForgeImporters/forgeimporters/github/__init__.py index ebbbef9..eee1af2 100644 --- a/ForgeImporters/forgeimporters/github/__init__.py +++ b/ForgeImporters/forgeimporters/github/__init__.py @@ -54,7 +54,7 @@ class GitHubProjectNameValidator(fev.FancyValidator): messages = { 'invalid': 'Valid symbols are: letters, numbers, dashes, ' 'underscores and periods', - 'unavailable': 'This project is unavailable for import', + 'unavailable': 'This is not a valid Github project that can be used for import', } def _to_python(self, value, state=None): diff --git a/ForgeImporters/forgeimporters/github/templates/project.html b/ForgeImporters/forgeimporters/github/templates/project.html index 2c2a6d5..898f180 100644 --- a/ForgeImporters/forgeimporters/github/templates/project.html +++ b/ForgeImporters/forgeimporters/github/templates/project.html @@ -21,10 +21,11 @@ {% block project_fields %} - + <div class="grid-16" style="clear: left"> + <p>Paste your Github URL to autocomplete the required fields</p> + </div> <div class="grid-6" style="clear:left"> <label>GitHub Project URL - <span class="tooltip" title="Paste a Github project url to automatically set the user name and project name">{{ shared_svgs_macro.global_svgs('info-circle', class='svgico info-circle') }}</span> </label> </div> <div class="grid-10"> @@ -33,11 +34,16 @@ {{c.form_errors['project_url']}} </div> </div> - + <div class="grid-10" style="clear: left"> + <label>OR</label> + </div> + <div class="grid-16" style="clear: left"> + <p>Manually capture the required information</p> + </div> <div class="grid-6" style="clear:left"> <label> GitHub User Name - <span class="tooltip" title="Your Github user name can be found in the dropdown menu when you click on your avatar">{{ shared_svgs_macro.global_svgs('info-circle', class='svgico info-circle') }}</span> + <span class="tooltip" title="Your Github User or Organization Name can be found in the dropdown menu when you click on your avatar">{{ shared_svgs_macro.global_svgs('info-circle', class='svgico info-circle') }}</span> </label> </div> <div class="grid-10"> @@ -65,7 +71,9 @@ </div> <div class="grid-6" style="clear:left"> - <label>{{config.site_name}} URL Name</label> + <label>{{config.site_name}} URL Name + <span class="tooltip" title="Set the project name to be used in the url of your project page">{{ shared_svgs_macro.global_svgs('info-circle', class='svgico info-circle') }}</span> + </label> </div> <div class="grid-10"> <input id="project_shortname" name="project_shortname" value="{{c.form_values['project_shortname']}}"/> diff --git a/ForgeImporters/forgeimporters/templates/project_base.html b/ForgeImporters/forgeimporters/templates/project_base.html index 0eea95d..65b33b8 100644 --- a/ForgeImporters/forgeimporters/templates/project_base.html +++ b/ForgeImporters/forgeimporters/templates/project_base.html @@ -67,7 +67,6 @@ $(function() { $('#project_name').bind('change keyup', suggest_name); $('#project_shortname').bind('change keyup', function(event) { - console.log("EVEN FIRED!!!") if (event.type == 'keyup') { manual = true; }
