Advertisement
Guest User

Untitled

a guest
Apr 27th, 2017
89
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 9.94 KB | None | 0 0
  1. diff --git a/custom/modules/Accounts/clients/base/views/hierarchy/hierarchy.hbs b/custom/modules/Accounts/clients/base/views/hierarchy/hierarchy.hbs
  2. index 96803f4..06abd14 100644
  3. --- a/custom/modules/Accounts/clients/base/views/hierarchy/hierarchy.hbs
  4. +++ b/custom/modules/Accounts/clients/base/views/hierarchy/hierarchy.hbs
  5. @@ -7,12 +7,13 @@
  6. .accordion-content.default {
  7. display: block;
  8. }
  9. + .accordion_sign {
  10. + display: inline;
  11. + }
  12. .accordion_sign:after {
  13. content: '\02795'; /* Unicode character for "plus" sign (+) */
  14. font-size: 13px;
  15. color: #777;
  16. - float: right;
  17. - margin-left: 5px;
  18. }
  19.  
  20. .accordion_sign.active:after {
  21. @@ -21,7 +22,6 @@
  22.  
  23. .subpanelButton {
  24. float: right;
  25. - margin-top: -16px !important;
  26. padding-top: 0px;
  27. padding-bottom: 0px;
  28. height: 15px;
  29. @@ -31,6 +31,24 @@
  30. margin-top: -1px;
  31. }
  32.  
  33. + .recordName {
  34. + padding-left: 10px;
  35. + font-size: 16px;
  36. + }
  37. +
  38. + .recordName p{
  39. + display: inline;
  40. + padding-left: 3px;
  41. + }
  42. +
  43. + .record {
  44. + padding: 5px;
  45. + }
  46. +
  47. + .self {
  48. + color: green;
  49. + }
  50. +
  51. </style>
  52.  
  53. <div class="thumbnail dashlet ui-draggable" data-type="dashlet" data-action="droppable">
  54. @@ -58,13 +76,15 @@
  55. <span class="list">
  56. <div class="ellipsis_inline" data-placement="bottom" title="">
  57. <div id="accordion">
  58. - {{log results }}
  59. {{#if results.records}}
  60. {{#each results.records}}
  61. - <a href="#{{buildRoute module=this.module id=this.id}}"><p>{{this.name}}</p></a>
  62. - <p class="accordion_sign accordion-toggle" style="float: right; margin-top: -15px;" data-id="{{this.id}}" data-module="{{this.module}}" data-link="group_entity"></p>
  63. - <div id="{{this.id}}" class="accordion-content">
  64. + <div class="record">
  65. + <p class="accordion_sign accordion-toggle" data-id="{{this.id}}" data-module="{{this.module}}" data-link="group_entity"></p>
  66. + <a href="#{{buildRoute module=this.module id=this.id}}" class="fa fa-archive recordName"><p>{{this.name}}</p></a>
  67. +
  68. + <div id="{{this.id}}" class="accordion-content">
  69.  
  70. + </div>
  71. </div>
  72. {{/each}}
  73. {{/if}}
  74. diff --git a/custom/modules/Accounts/clients/base/views/hierarchy/row.hbs b/custom/modules/Accounts/clients/base/views/hierarchy/row.hbs
  75. index f7828a0..019c985 100644
  76. --- a/custom/modules/Accounts/clients/base/views/hierarchy/row.hbs
  77. +++ b/custom/modules/Accounts/clients/base/views/hierarchy/row.hbs
  78. @@ -1,11 +1,13 @@
  79. <!-- For the second level Commercial Entities -->
  80. {{#if results.record.commercial_entities}}
  81. {{#each results.record.commercial_entities}}
  82. - <a href="#{{buildRoute module=this.module id=this.id}}"><p>{{this.name}}</p></a>
  83. - <p class="accordion_sign accordion-toggle" style="float: right; margin-top: -15px;" data-id="{{this.id}}" data-module="Accounts" data-link="accounts_bnp_legal_entities_1"></p>
  84. - <a href="javascript:void(0);" class="btn subpanelButton" data-id="{{this.id}}" data-module="Accounts" role="button" tabindex="0"><p>Details</p></a>
  85. - <div id="{{this.id}}" class="accordion-content" data-id="{{this.id}}">
  86. + <div class="record">
  87. + <p class="accordion_sign accordion-toggle" data-id="{{this.id}}" data-module="Accounts" data-link="accounts_bnp_legal_entities_1"></p>
  88. + <a href="#{{buildRoute module=this.module id=this.id}}" class="fa fa-bar-chart-o recordName{{#eq this.id ../this.model.id}} self{{/eq}}"><p>{{this.name}}</p></a>
  89. + <a href="javascript:void(0);" class="btn subpanelButton" data-id="{{this.id}}" data-module="Accounts" role="button" tabindex="0"><p>Details</p></a>
  90. + <div id="{{this.id}}" class="accordion-content" data-id="{{this.id}}">
  91.  
  92. + </div>
  93. </div>
  94. {{/each}}
  95. {{/if}}
  96. @@ -13,13 +15,17 @@
  97. <!-- For the second level Legal Entities -->
  98. {{#if results.record.legal_entities}}
  99. {{#each results.record.legal_entities}}
  100. - <a href="#{{buildRoute module=this.module id=this.id}}"><p>{{this.name}}</p></a>
  101. + <div class="record">
  102. + <a href="#{{buildRoute module=this.module id=this.id}}" class="fa fa-gavel recordName"><p>{{this.name}}</p></a>
  103. + </div>
  104. {{/each}}
  105. {{/if}}
  106.  
  107. <!-- For the third level Legal Entities -->
  108. {{#if results.records}}
  109. {{#each results.records}}
  110. - <a href="#{{buildRoute module=this.module id=this.id}}"><p>{{this.name}}</p></a>
  111. + <div class="record">
  112. + <a href="#{{buildRoute module=this.module id=this.id}}" class="fa fa-gavel recordName"><p>{{this.name}}</p></a>
  113. + </div>
  114. {{/each}}
  115. {{/if}}
  116. diff --git a/custom/modules/bnp_commercial_groups/clients/base/views/hierarchy/hierarchy.hbs b/custom/modules/bnp_commercial_groups/clients/base/views/hierarchy/hierarchy.hbs
  117. index 4e62688..1ae14ce 100644
  118. --- a/custom/modules/bnp_commercial_groups/clients/base/views/hierarchy/hierarchy.hbs
  119. +++ b/custom/modules/bnp_commercial_groups/clients/base/views/hierarchy/hierarchy.hbs
  120. @@ -7,25 +7,37 @@
  121. .accordion-content.default {
  122. display: block;
  123. }
  124. +
  125. + .accordion_sign {
  126. + display: inline;
  127. + }
  128. +
  129. .accordion_sign:after {
  130. content: '\02795'; /* Unicode character for "plus" sign (+) */
  131. font-size: 13px;
  132. color: #777;
  133. - float: right;
  134. - margin-left: 5px;
  135. }
  136.  
  137. .accordion_sign.active:after {
  138. content: "\2796"; /* Unicode character for "minus" sign (-) */
  139. }
  140.  
  141. - .recordTitle {
  142. - padding: 4px;
  143. + .recordName {
  144. + padding-left: 10px;
  145. + font-size: 16px;
  146. + }
  147. +
  148. + .recordName p{
  149. + display: inline;
  150. + padding-left: 3px;
  151. }
  152.  
  153. - .accordion-toggle {
  154. - float: right;
  155. - margin-top: -18px !important;
  156. + .record {
  157. + padding: 5px;
  158. + }
  159. +
  160. + .self {
  161. + color: green;
  162. }
  163.  
  164. </style>
  165. @@ -56,9 +68,13 @@
  166. <span class="list">
  167. <div class="ellipsis_inline" data-placement="bottom" title="">
  168. <div id="accordion">
  169. - <a href="#{{buildRoute module=this.module id=record.id}}"><p class="recordTitle">{{record.name}}</p></a>
  170. - <p class="accordion_sign accordion-toggle" data-id="{{record.id}}" data-module="bnp_commercial_groups" data-link="group_entity"></p>
  171. - <div id="{{record.id}}" class="accordion-content" data-id="{{record.id}}">
  172. + <div class="record">
  173. + <p class="accordion_sign accordion-toggle" data-id="{{record.id}}" data-module="bnp_commercial_groups" data-link="group_entity"></p>
  174. + <a href="#{{buildRoute module=this.module id=record.id}}" class="fa fa-archive recordName"><p>{{record.name}}</p></a>
  175. +
  176. + <div id="{{record.id}}" class="accordion-content">
  177. +
  178. + </div>
  179. </div>
  180. </div>
  181. </div>
  182. diff --git a/custom/modules/bnp_commercial_groups/clients/base/views/hierarchy/row.hbs b/custom/modules/bnp_commercial_groups/clients/base/views/hierarchy/row.hbs
  183. index 69ec46f..99426a8 100644
  184. --- a/custom/modules/bnp_commercial_groups/clients/base/views/hierarchy/row.hbs
  185. +++ b/custom/modules/bnp_commercial_groups/clients/base/views/hierarchy/row.hbs
  186. @@ -1,23 +1,29 @@
  187.  
  188. {{#if results.records}}
  189. -
  190. {{#each results.records}}
  191. - <a href="#{{buildRoute module=this.module id=this.id}}"><p class="recordTitle">{{this.name}}</p></a>
  192. + <div class="record">
  193. + <a href="#{{buildRoute module=this.module id=this.id}}" class="fa fa-gavel recordName"><p>{{this.name}}</p></a>
  194. + </div>
  195. {{/each}}
  196. -
  197. {{/if}}
  198.  
  199. {{#if results.record.commercial_entities}}
  200. {{#each results.record.commercial_entities}}
  201. - <a href="#{{buildRoute module=this.module id=this.id}}"><p class="recordTitle">{{this.name}}</p></a>
  202. - <p class="accordion_sign accordion-toggle" data-id="{{this.id}}" data-module="Accounts" data-link="accounts_bnp_legal_entities_1"></p>
  203. - <div id="{{this.id}}" class="accordion-content" data-id="{{this.id}}">
  204. + <div class="record">
  205. + <p class="accordion_sign accordion-toggle" data-id="{{this.id}}" data-module="Accounts" data-link="accounts_bnp_legal_entities_1"></p>
  206. + <a href="#{{buildRoute module=this.module id=this.id}}" class="fa fa-bar-chart-o recordName"><p>{{this.name}}</p></a>
  207. +
  208. + <div id="{{this.id}}" class="accordion-content" data-id="{{this.id}}">
  209. +
  210. + </div>
  211. </div>
  212. {{/each}}
  213. {{/if}}
  214.  
  215. {{#if results.record.legal_entities}}
  216. {{#each results.record.legal_entities}}
  217. - <a href="#{{buildRoute module=this.module id=this.id}}"><p class="recordTitle">{{this.name}}</p></a>
  218. + <div class="record">
  219. + <a href="#{{buildRoute module=this.module id=this.id}}" class="fa fa-gavel recordName"><p>{{this.name}}</p></a>
  220. + </div>
  221. {{/each}}
  222. {{/if}}
  223. diff --git a/hierarchyUpdate1.patch b/hierarchyUpdate1.patch
  224. new file mode 100644
  225. index 0000000..e69de29
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement