allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kentontay...@apache.org
Subject [1/2] allura git commit: Improve user skills interface:
Date Fri, 26 Jan 2018 20:04:41 GMT
Repository: allura
Updated Branches:
  refs/heads/master 272893aff -> 9a30fec1a


Improve user skills interface:

* breadcrumbs work correctly no matter the current url
* don't show form to enter a skill for "parent_only" categories
* fix typos/wording


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/b6fb1ea4
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b6fb1ea4
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b6fb1ea4

Branch: refs/heads/master
Commit: b6fb1ea42a8c6892531b74153e754d00e3cdf093
Parents: f554f78
Author: Dave Brondsema <dave@brondsema.net>
Authored: Thu Jan 25 10:39:49 2018 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Thu Jan 25 10:39:49 2018 -0500

----------------------------------------------------------------------
 Allura/allura/templates/user_skills.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/b6fb1ea4/Allura/allura/templates/user_skills.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/user_skills.html b/Allura/allura/templates/user_skills.html
index 499c0e5..e971dc4 100644
--- a/Allura/allura/templates/user_skills.html
+++ b/Allura/allura/templates/user_skills.html
@@ -63,9 +63,9 @@
           You selected:
         </div>
         <div class="grid-12" style="margin-bottom:20px">      
-           <a href=".">List of all skills</a>
+           <a href="/auth/user_info/skills/">List of all skills</a>
            {% for cat in parents %}
-             &gt; <a href="{{cat.trove_cat_id}}">{{cat.fullname}}</a>
+             &gt; <a href="/auth/user_info/skills/{{cat.trove_cat_id}}">{{cat.fullname}}</a>
            {% endfor %}
            &gt; <b>{{selected_skill.fullname}}</b>
            <input type="hidden" name="upper_category" value="{{selected_skill.trove_parent_id}}"/>
@@ -81,8 +81,8 @@
       {%endif%}
       {{g.theme.select_subcategory_form.display(categories=skills_list)}}
     {% endif %}
-    {% if selected_skill %}
-      <h3>Add "{{selected_skill.fullname}}" to you set of skills</h3>
+    {% if selected_skill and not selected_skill.parent_only %}
+      <h3>Add "{{selected_skill.fullname}}" to your set of skills</h3>
       {{g.theme.add_user_skill.display(selected_skill=selected_skill.trove_cat_id, 
            action="{}/save_skill".format(selected_skill.trove_cat_id)) }}
     {% endif %}
@@ -101,7 +101,7 @@
           {% endif %}
         {%endif%}
         <li>
-          <a href="/auth/prefs">Go to your profile</a> to set the remaining personal
preferences.
+          <a href="/auth/user_info">Go back</a> to set other personal preferences.
         </li>
       </ul>
     </div>


Mime
View raw message