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 ed93c790dc9615ea3227c6eb1bf0d95a717daa20 Author: Guillermo Cruz <[email protected]> AuthorDate: Mon Dec 13 12:08:23 2021 -0700 8403 added field diver for SF project shortname and a on blur event on project_url to check for valid github url --- .../forgeimporters/github/templates/project.html | 38 ++++++++++++++-------- .../forgeimporters/templates/project_base.html | 3 ++ 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/ForgeImporters/forgeimporters/github/templates/project.html b/ForgeImporters/forgeimporters/github/templates/project.html index 898f180..97211c4 100644 --- a/ForgeImporters/forgeimporters/github/templates/project.html +++ b/ForgeImporters/forgeimporters/github/templates/project.html @@ -22,10 +22,11 @@ {% block project_fields %} <div class="grid-16" style="clear: left"> - <p>Paste your Github URL to autocomplete the required fields</p> + <p>Paste your Github URL to auto-fill your repository information</p> </div> - <div class="grid-6" style="clear:left"> - <label>GitHub Project URL + <div class="grid-7" style="clear:left"> + <label>GitHub Repository URL + <span class="tooltip" title="A valid Github repository URL">{{ shared_svgs_macro.global_svgs('info-circle', class='svgico info-circle') }}</span> </label> </div> <div class="grid-10"> @@ -34,16 +35,16 @@ {{c.form_errors['project_url']}} </div> </div> - <div class="grid-10" style="clear: left"> + <div class="grid-10 field-divider"> <label>OR</label> </div> <div class="grid-16" style="clear: left"> - <p>Manually capture the required information</p> + <p>Manually enter your Github repository information</p> </div> - <div class="grid-6" style="clear:left"> + <div class="grid-7" style="clear:left"> <label> - GitHub User Name - <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> + Github User / Organization + <span class="tooltip" title="Your Github user or organization Name.">{{ shared_svgs_macro.global_svgs('info-circle', class='svgico info-circle') }}</span> </label> </div> <div class="grid-10"> @@ -56,10 +57,10 @@ - <div class="grid-6" style="clear:left"> + <div class="grid-7" style="clear:left"> <label> - GitHub Project Name - <span class="tooltip" title="You can select any name from your repositories section">{{ shared_svgs_macro.global_svgs('info-circle', class='svgico info-circle') }}</span> + GitHub Repo Name + <span class="tooltip" title="The name of any repository in your Github repository list.">{{ shared_svgs_macro.global_svgs('info-circle', class='svgico info-circle') }}</span> </label> </div> @@ -70,9 +71,16 @@ </div> </div> - <div class="grid-6" style="clear:left"> + <div class="grid-10 field-divider"> + <label>Then</label> + </div> + + <div class="grid-16" style="clear: left;"> + <p>Pick a URL</p> + </div> + <div class="grid-7" style="clear:left"> <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> + <span class="tooltip" title="A link-friendly name for your project's URL.">{{ shared_svgs_macro.global_svgs('info-circle', class='svgico info-circle') }}</span> </label> </div> <div class="grid-10"> @@ -120,7 +128,11 @@ $('#project_name').val(_name); $('#user_name').val(_owner); $('#project_name').trigger('change'); + }) }) </script> + <style> + .field-divider{clear: left;padding-top:5px;padding-bottom:5px;}; + </style> {% endblock %} diff --git a/ForgeImporters/forgeimporters/templates/project_base.html b/ForgeImporters/forgeimporters/templates/project_base.html index 65b33b8..120e8be 100644 --- a/ForgeImporters/forgeimporters/templates/project_base.html +++ b/ForgeImporters/forgeimporters/templates/project_base.html @@ -74,6 +74,9 @@ }); $('#project_name').bind('blur', check_names); $('#project_shortname').bind('blur', check_names); + if($('#project_url').length === 1) { + $('#project_url').bind('blur', check_names); + } }); </script> {% endblock %}
