Browse Source

git push origin 1.10.xMerge branch 'aragonc-secuencia' into 1.10.x

Yannick Warnier 9 years ago
parent
commit
bbf36f67af

+ 9 - 1
app/Resources/public/css/base.css

@@ -5828,8 +5828,16 @@ div#chat-remote-video video {
 }
 #parents .parent {
   display: inline-block;
-  padding: 5px;
   width: 15%;
+  padding: 5px;
+  /* background: url("../../main/img/icons/48/sequence-arrow.png") no-repeat center bottom; */
+}
+.arrow-sequence{
+  height: 68px;
+  background: url("../../main/img/icons/48/sequence-arrow.png") no-repeat center 15px;
+  margin-top: 10px;
+  border-top: 1px dotted #ccc;
+  padding-top: 10px;
 }
 #parents .parent .big-icon{
   background-color: #ECF0F1 ;

BIN
main/img/icons/48/sequence-arrow.png


+ 8 - 6
main/template/default/admin/resource_sequence.tpl

@@ -21,11 +21,15 @@
                 success: function (data) {
                     if (data) {
                         var listLoaded = data.split(',');
-                        listLoaded.forEach(function(value) {
+                        var count = listLoaded.length;
+                        listLoaded.forEach(function(value, index) {
                             $.ajax({
                                 url: url + '?a=get_icon&id='+ value+'&type='+type+'&sequence_id='+sequenceId+'&show_delete=1',
                                 success:function(data){
                                     $('#parents').append(data);
+                                    if (index != (count - 1)) {
+                                        $('#parents').append('<div class="sequence-plus-icon">+</div>');
+                                    }
                                     parentList.push(value);
                                 }
                             });
@@ -201,20 +205,18 @@
                     </h4>
                     <div id="parents">
                     </div>
-
+                    <div class="arrow-sequence"></div>
                     <h4 class="title-sequence">{{ 'Item' | get_lang }}</h4>
                     <div id="resource">
                     </div>
-
+                    <div class="arrow-sequence"></div>
                     <h4 class="title-sequence">{{ 'Dependencies' | get_lang }}</h4>
                     <div id="children">
                     </div>
 
-                    <h4 class="title-sequence">{{ 'Graph' | get_lang }}</h4>
-
-
                 </div>
                 <div class="col-md-3">
+                    <h4 class="title-sequence">{{ 'GraphDependencyTree' | get_lang }}</h4>
                     <div id="show_graph"></div>
                 </div>