Skip to content

Commit edf5e57

Browse files
syypoosyypoo
authored
Merge pull request #21 from GenesisKernel/aa-470
renamed by code style
2 parents 0a6d346 + 231fd9b commit edf5e57

16 files changed

Lines changed: 120 additions & 115 deletions

‎basic/platform_ecosystem.json‎

Lines changed: 30 additions & 30 deletions
Large diffs are not rendered by default.

‎src/basic/platform_ecosystem/menus/default_menu.ptl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
MenuGroup(Title:Admin, Icon:"icon-arrow-right"){
2-
MenuItem(Title:Voting templates, Page:voting_templates, Icon:"fa icon-pin")
2+
MenuItem(Title:Voting templates, Page:voting_templates_list, Icon:"fa icon-pin")
33
MenuItem(Title:Platform parameter,Page:sysparams_list, Icon:"fa icon-settings")
4-
MenuItem(Title:Candidate for validators, Page:sysparams_candidates, Icon:"icon-list")
5-
MenuItem(Title:Ecosystems list, Page:sysparams_ecos, Icon:"icon-list")
4+
MenuItem(Title:Candidate for validators, Page: sysparams_candidates_list, Icon:"icon-list")
5+
MenuItem(Title:Ecosystems list, Page: sysparams_ecosystems_list, Icon:"icon-list")
66
MenuItem(Title:Tokens refund list, Page:tokenrefund_list, Icon:"icon-list")
7-
MenuItem(Title:Ecosystems, Page:membership_ecosystems, Icon:"fa fa-list-ul")
7+
MenuItem(Title:Ecosystems, Page: membership_ecosystems_list, Icon:"fa fa-list-ul")
88
}

src/basic/platform_ecosystem/pages/catalog_ecosystems_add.ptl renamed to src/basic/platform_ecosystem/pages/catalog_ecosystems_create.ptl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ Div(content-wrapper){
8686
}
8787
}
8888
Div(panel-footer text-right){
89-
Button(Body: LangRes(back), Class: btn btn-default, Page: catalog_ecosystems)
90-
Button(Contract: catalog_ecosystems_Add, Class: btn btn-primary, Page: catalog_ecosystems, Body: $send$)
89+
Button(Body: LangRes(back), Class: btn btn-default, Page: catalog_ecosystems_list)
90+
Button(Contract: catalog_ecosystems_Add, Class: btn btn-primary, Page: catalog_ecosystems_list, Body: $send$)
9191
}
9292
}
9393
}

src/basic/platform_ecosystem/pages/catalog_ecosystems.ptl renamed to src/basic/platform_ecosystem/pages/catalog_ecosystems_list.ptl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Div(content-wrapper){
22
DBFind(Name:applications, Source:src_app).Columns("name,id").Where("name='Basic application'").Vars(appication)
33
SetTitle($catalog_ecosystems$)
4-
AddToolButton(Title: $add$, Page: catalog_ecosystems_add, Icon: icon-plus)
4+
AddToolButton(Title: $add$, Page: catalog_ecosystems_create, Icon: icon-plus)
55

66
If(#param_flag_free#==0){
77
SetVar(Name: v_where, Value: "deleted=0")
@@ -18,19 +18,19 @@ Div(content-wrapper){
1818
Div(col-md-12 text-left){
1919
Div(btn-group){
2020
If(#param_flag_free#==0){
21-
Span(Button(Body: Em(Class: fa fa-align-justify) $all$, Page: catalog_ecosystems, PageParams: "param_flag_free=0", Class: btn bg-gray-lighter)).Style(margin-left:5px;)
21+
Span(Button(Body: Em(Class: fa fa-align-justify) $all$, Page: catalog_ecosystems_list, PageParams: "param_flag_free=0", Class: btn bg-gray-lighter)).Style(margin-left:5px;)
2222
}.Else{
23-
Span(Button(Body: Em(Class: fa fa-align-justify) $all$, Page: catalog_ecosystems, PageParams: "param_flag_free=0", Class: btn bg-gray)).Style(margin-left:5px;)
23+
Span(Button(Body: Em(Class: fa fa-align-justify) $all$, Page: catalog_ecosystems_list, PageParams: "param_flag_free=0", Class: btn bg-gray)).Style(margin-left:5px;)
2424
}
2525
If(#param_flag_free#==1){
26-
Span(Button(Body: Em(Class: fa fa-user-o) $not_need_fuel$, Page: catalog_ecosystems, PageParams: "param_flag_free=1", Class: btn bg-gray-lighter)).Style(margin-left:5px;)
26+
Span(Button(Body: Em(Class: fa fa-user-o) $not_need_fuel$, Page: catalog_ecosystems_list, PageParams: "param_flag_free=1", Class: btn bg-gray-lighter)).Style(margin-left:5px;)
2727
}.Else{
28-
Span(Button(Body: Em(Class: fa fa-user-o) $not_need_fuel$, Page: catalog_ecosystems, PageParams: "param_flag_free=1", Class: btn bg-gray)).Style(margin-left:5px;)
28+
Span(Button(Body: Em(Class: fa fa-user-o) $not_need_fuel$, Page: catalog_ecosystems_list, PageParams: "param_flag_free=1", Class: btn bg-gray)).Style(margin-left:5px;)
2929
}
3030
If(#param_flag_free#==2){
31-
Span(Button(Body: Em(Class: fa fa-money) $need_fuel$, Page: catalog_ecosystems, PageParams: "param_flag_free=2", Class: btn bg-gray-lighter)).Style(margin-left:5px;)
31+
Span(Button(Body: Em(Class: fa fa-money) $need_fuel$, Page: catalog_ecosystems_list, PageParams: "param_flag_free=2", Class: btn bg-gray-lighter)).Style(margin-left:5px;)
3232
}.Else{
33-
Span(Button(Body: Em(Class: fa fa-money) $need_fuel$, Page: catalog_ecosystems, PageParams: "param_flag_free=2", Class: btn bg-gray)).Style(margin-left:5px;)
33+
Span(Button(Body: Em(Class: fa fa-money) $need_fuel$, Page: catalog_ecosystems_list, PageParams: "param_flag_free=2", Class: btn bg-gray)).Style(margin-left:5px;)
3434
}
3535
}
3636
}

‎src/basic/platform_ecosystem/pages/ecosystem_new.ptl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Form(){
44
Input(Placeholder: Name of Ecosystem, Name:Name)
55
}
66
Div(form-group){
7-
Button(Body: LangRes(create), Class: btn pull-right btn-primary, Contract: @1NewEcosystem, Page: membership_ecosystems)
8-
Button(Body: LangRes(back), Class: btn pull-right btn-default, Page: membership_ecosystems)
7+
Button(Body: LangRes(create), Class: btn pull-right btn-primary, Contract: @1NewEcosystem, Page: membership_ecosystems_list)
8+
Button(Body: LangRes(back), Class: btn pull-right btn-default, Page: membership_ecosystems_list)
99
}
1010
}

src/basic/platform_ecosystem/pages/membership_ecosystems.ptl renamed to src/basic/platform_ecosystem/pages/membership_ecosystems_list.ptl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Div(content-wrapper){
2929
}
3030
Input(Name: Search, Value: #v_Search#)
3131
Div(input-group-btn){
32-
Button(Class: btn btn-default fa fa-search, Page: membership_ecosystems, PageParams: "isSearch=1,v_Search=Val(Search)")
32+
Button(Class: btn btn-default fa fa-search, Page: membership_ecosystems_list, PageParams: "isSearch=1,v_Search=Val(Search)")
3333
}
3434
}
3535
}
@@ -46,7 +46,7 @@ Div(content-wrapper){
4646
DBFind(keys, src_keys).Where("id = #key_id#").Ecosystem(#id#).Limit(1).Vars("k")
4747

4848
If(And(#notific_count# == 0, GetVar(k_id) == "")){
49-
Button(Class: btn btn-link pull-right, Body: Send Request, Contract: "membership_send_request", Page: membership_ecosystems, Params: "ecosystem_num=#id#")
49+
Button(Class: btn btn-link pull-right, Body: Send Request, Contract: "membership_send_request", Page: membership_ecosystems_list, Params: "ecosystem_num=#id#")
5050
}
5151
}
5252

@@ -60,7 +60,7 @@ Div(content-wrapper){
6060
Div(row){
6161
Div(col-md-12 mt-lg){
6262
Div(text-center){
63-
Button(Body: $view_all$, Class: btn btn-primary, Page: membership_ecosystems, PageParams: "isSearch=0")
63+
Button(Body: $view_all$, Class: btn btn-primary, Page: membership_ecosystems_list, PageParams: "isSearch=0")
6464
}
6565
}
6666
}

src/basic/platform_ecosystem/pages/sysparams_candidate_validators_form.ptl renamed to src/basic/platform_ecosystem/pages/sysparams_candidate_validators_create.ptl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ Div(content-wrapper){
3939
}
4040
Div(panel-footer text-right){
4141
Div(pull-left){
42-
Button(Body: LangRes(back), Class: btn btn-default, Page: sysparams_candidates)
42+
Button(Body: LangRes(back), Class: btn btn-default, Page: sysparams_candidates_list)
4343
}
44-
Button(Contract: sysparams_CandidateValidatorRequest, Class: btn btn-primary, Page: sysparams_candidates, Body: $send$)
44+
Button(Contract: sysparams_CandidateValidatorRequest, Class: btn btn-primary, Page: sysparams_candidates_list, Body: $send$)
4545
}
4646
}
4747
}

src/basic/platform_ecosystem/pages/sysparams_candidates.ptl renamed to src/basic/platform_ecosystem/pages/sysparams_candidates_list.ptl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Div(content-wrapper){
3030
Table(Source: src_candidates, Columns: "$id$=id,$host_ip$=host_ip,$commission_address$=commission_address,$description_equipment$=description,$comment$=comment,$date_created$=_date,$voting$=_actions")
3131
}
3232
Div(panel-footer text-right){
33-
Button(Body: $add$, Class: btn btn-primary, Page: sysparams_candidate_validators_form)
33+
Button(Body: $add$, Class: btn btn-primary, Page: sysparams_candidate_validators_create)
3434
}
3535
}
3636
}

src/basic/platform_ecosystem/pages/sysparams_ecos.ptl renamed to src/basic/platform_ecosystem/pages/sysparams_ecosystems_list.ptl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DBFind(ecosystems,ecos).Order(id).Custom(_actions){
1010
If(#is_valued#==0){
1111
Input(Name: RowId, Type: hidden, Value: #id#)
1212
Input(Name: NewValue, Type: hidden, Value: 1)
13-
Button(Body: $start_voting_ves$, Class: btn btn-block btn-primary, Page: sysparams_ecos, Contract: voting_TemplateRun)
13+
Button(Body: $start_voting_ves$, Class: btn btn-block btn-primary, Page: sysparams_ecosystems_list, Contract: voting_TemplateRun)
1414
}
1515
}.Else{
1616
Span(voting id template not found in parameters, text-muted)
@@ -64,7 +64,7 @@ Div(content-wrapper){
6464
}
6565
}
6666
Div(panel-footer text-right){
67-
Button(Body: LangRes(udpate_metrics), Page:sysparams_ecos, Class:btn btn-primary, Contract:sysparams_UpdateMetrics)
67+
Button(Body: LangRes(udpate_metrics), Page: sysparams_ecosystems_list, Class:btn btn-primary, Contract:sysparams_UpdateMetrics)
6868
}
6969
}
7070
Form(panel panel-primary){

‎src/basic/platform_ecosystem/pages/sysparams_metrics.ptl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Div(content-wrapper){
22
Div(breadcrumb){
3-
LinkPage(Body: LangRes(sysparams_ecos), Page:sysparams_ecos)
3+
LinkPage(Body: LangRes(sysparams_ecos), Page: sysparams_ecosystems_list)
44
Span("/",mh-sm)
55
Span(LangRes(sysparams_metrics), text-muted)
66
}

0 commit comments

Comments
 (0)