edb/kassa
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Minor fixes and TODOs

Browse Source
This commit is contained in:
nikolark committed 2015-08-02 23:51:21 +02:00
1 parent da0e945812
commit 6a65446bfa
8 files changed
+23 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

static/app/scripts/app.js
+2 -2
View File
@@ -397,14 +397,14 @@ $(document).ready(function(){
/* Register type */
// FIXME: get from form
// action: 'new_card_no_user', 'update_card', 'renewal'
// action: 'new_card_no_user', 'update_card', 'add_or_renew'
if(selectedUser === null) {
payload.action = 'new_card_no_user';
} else {
if(selectedUser.is_member === '1') {
payload.action = 'update_card';
} else {
payload.action = 'renewal'; // Not: could also update card number
payload.action = 'add_or_renew'; // Note: could also update card number
}
}
static/app/templates/search_result.html
+2 -2
View File
@@ -29,8 +29,8 @@
{% if not no_user_actions %}
<div class="user-actions">
<div class="btn-group">
<a href="#" class="btn btn-default{% if res.is_member == "1" %} disabled{% endif %}">Membership</a>
<a href="#" class="btn btn-default">Reg. card</a>
<!--<a href="#" class="btn btn-default{% if res.is_member == "1" %} disabled{% endif %}">Membership</a>
<a href="#" class="btn btn-default">Reg. card</a>-->
<div class="btn-group" role="group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-option-vertical"></span>
static/dist/scripts/app.js
Vendored
+2 -2
View File
@@ -397,14 +397,14 @@ $(document).ready(function(){
/* Register type */
// FIXME: get from form
// action: 'new_card_no_user', 'update_card', 'renewal'
// action: 'new_card_no_user', 'update_card', 'add_or_renew'
if(selectedUser === null) {
payload.action = 'new_card_no_user';
} else {
if(selectedUser.is_member === '1') {
payload.action = 'update_card';
} else {
payload.action = 'renewal'; // Not: could also update card number
payload.action = 'add_or_renew'; // Note: could also update card number
}
}
static/dist/scripts/templates.js
Vendored
+2 -2
View File
@@ -70,12 +70,12 @@ output += "\n <span class=\"label label-is-active\">Active</span>\n
}
output += "\n </div>\n ";
if(!runtime.contextOrFrameLookup(context, frame, "no_user_actions")) {
output += "\n <div class=\"user-actions\">\n <div class=\"btn-group\">\n <a href=\"#\" class=\"btn btn-default";
output += "\n <div class=\"user-actions\">\n <div class=\"btn-group\">\n <!--<a href=\"#\" class=\"btn btn-default";
if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"is_member", env.opts.autoescape) == "1") {
output += " disabled";
;
}
output += "\">Membership</a>\n <a href=\"#\" class=\"btn btn-default\">Reg. card</a>\n <div class=\"btn-group\" role=\"group\">\n <button type=\"button\" class=\"btn btn-default dropdown-toggle\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">\n <span class=\"glyphicon glyphicon-option-vertical\"></span>\n </button>\n <ul class=\"dropdown-menu\">\n <li><a href=\"https://inside.studentersamfundet.no/index.php?page=display-user&userid=";
output += "\">Membership</a>\n <a href=\"#\" class=\"btn btn-default\">Reg. card</a>-->\n <div class=\"btn-group\" role=\"group\">\n <button type=\"button\" class=\"btn btn-default dropdown-toggle\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">\n <span class=\"glyphicon glyphicon-option-vertical\"></span>\n </button>\n <ul class=\"dropdown-menu\">\n <li><a href=\"https://inside.studentersamfundet.no/index.php?page=display-user&userid=";
output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"id", env.opts.autoescape), env.opts.autoescape);
output += "\" target=\"_blank\">Edit in Inside</a></li>\n </ul>\n </div>\n </div>\n </div>\n ";
;