ADAM / AIAHTML5

Commit 5dacb770778bcf77fb013f38994e5c676ce721ee

Authored by Nikita Kulshreshtha
2 parents e6899ac9 55fd4406

Merge remote-tracking branch 'origin/tablecibrush' into Develop

Inline Side-by-side
Showing 4 changed files with 50 additions and 24 deletions
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
  View file @5dacb77
... ... @@ -91,54 +91,54 @@
91 91 <table class="table table-hover table-fixed bg-white table-txt12" style="padding-left:25px; width:100%;">
92 92 <thead class="clsthead">
93 93 <tr class="active">
94   - <th>Title</th>
95   - <th>Region</th>
96   - <th>System</th>
97   - <th>View</th>
98   - <th>Type</th>
99   - <th>Specialty</th>
  94 + <th width="15%">Title</th>
  95 + <th width="15%">Region</th>
  96 + <th width="15%">System</th>
  97 + <th width="15%">View</th>
  98 + <th width="15%">Type</th>
  99 + <th width="25%">Specialty</th>
100 100 </tr>
101 101 </thead>
102 102 <tbody ng-if="!filterstring" class="clstbody">
103 103 <tr id="{{item._id}}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCIListViewData">
104   - <td>
  104 + <td width="15%">
105 105 {{item._Title}}
106 106 </td>
107   - <td>
  107 + <td width="15%">
108 108 {{item._BodyRegion}}
109 109 </td>
110   - <td>
  110 + <td width="15%">
111 111 {{item._BodySystem}}
112 112 </td>
113   - <td>
  113 + <td width="15%">
114 114 {{item._ViewOrientation}}
115 115 </td>
116   - <td>
  116 + <td width="15%">
117 117 {{item._ImageType}}
118 118 </td>
119   - <td>
  119 + <td width="25%">
120 120 {{item._MedicalSpecialty}}
121 121 </td>
122 122 </tr>
123 123 </tbody>
124 124 <tbody ng-if="filterstring" class="clstbody">
125 125 <tr ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in searchCIListViewData">
126   - <td>
  126 + <td width="15%">
127 127 {{item._Title}}
128 128 </td>
129   - <td>
  129 + <td width="15%">
130 130 {{item._BodyRegion}}
131 131 </td>
132   - <td>
  132 + <td width="15%">
133 133 {{item._BodySystem}}
134 134 </td>
135   - <td>
  135 + <td width="15%">
136 136 {{item._ViewOrientation}}
137 137 </td>
138   - <td>
  138 + <td width="15%">
139 139 {{item._ImageType}}
140 140 </td>
141   - <td>
  141 + <td width="25%">
142 142 {{item._MedicalSpecialty}}
143 143 </td>
144 144 </tr>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @5dacb77
... ... @@ -57,7 +57,7 @@
57 57 .customTooltip {
58 58 background: #333 !important;
59 59 color: #fff !important;
60   - opacity: 0.9 !important;
  60 + /*opacity: 0.9 !important;*/
61 61 }
62 62  
63 63  
... ... @@ -68,7 +68,7 @@
68 68 border: 0 none;
69 69 color: #fff !important;
70 70 left: -52px;
71   - opacity: 0.9;
  71 + /*opacity: 0.9;*/
72 72 padding: 7px;
73 73 position: absolute;
74 74 text-align: center;
... ... @@ -86,7 +86,7 @@
86 86 border: 0 none;
87 87 color: #fff !important;
88 88 left: 52px;
89   - opacity: 0.9;
  89 + /*opacity: 0.9;*/
90 90 padding: 7px;
91 91 position: absolute;
92 92 text-align: center;
... ... @@ -104,7 +104,7 @@
104 104 border: 0 none;
105 105 color: #fff !important;
106 106 right: 10px;
107   - opacity: 0.9;
  107 + /*opacity: 0.9;*/
108 108 padding: 7px;
109 109 position: absolute;
110 110 text-align: center;
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @5dacb77
1 1 <!DOCTYPE html>
2 2 <html lang="en" ng-cloak ng-app="AIA">
3 3 <head>
4   - <!--<base href="/AIA/" />-->
  4 + <!--<base href="/AIAHTML5/" />-->
5 5 <base href="/" />
6 6 <meta charset="utf-8">
7 7 <meta http-equiv="X-UA-Compatible" content="IE=edge">
... ... @@ -451,7 +451,7 @@
451 451 <div>
452 452 <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" id="paintLine" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></button>
453 453 <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" data-toggle="tooltip" data-placement="top" title="Erase" ng-click="EraseDrawing()"><i class="fa fa-eraser"></i></button>&nbsp;
454   - <div class="marginL2 pull-left"><input type="number" id="amount-2" value="25" step="1" style="width:60px;"></div>&nbsp;
  454 + <div class="marginL2 pull-left"><input type="number" id="amount-2" step="1" style="width:60px;" min="1" max="60" oninput="Brushsize(this)"></div>&nbsp;
455 455 <div class="pull-left" style="width:45%; margin-left:2%;">
456 456 <div id="slider-range-min-2"></div>
457 457 </div>
... ... @@ -1007,6 +1007,27 @@
1007 1007 div.style.display = 'block';
1008 1008 }
1009 1009 </script>
  1010 + <script>
  1011 + function Brushsize(object) {
  1012 +
  1013 + if (parseInt(object.value) == 0) {
  1014 + //object.value = 0;
  1015 + object.value = object.value.slice(0, 0);
  1016 +
  1017 + }
  1018 +
  1019 + if (parseInt(object.value) <= parseInt(object.max)) {
  1020 +
  1021 + object.value = object.value;
  1022 +
  1023 +
  1024 + }
  1025 + else {
  1026 + object.value = object.value.slice(0, 1);
  1027 +
  1028 + }
  1029 + }
  1030 + </script>
1010 1031  
1011 1032  
1012 1033 <!--<script src="libs/jquery/1.11.3/jquery.min.js"></script>-->
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @5dacb77
... ... @@ -667,6 +667,11 @@ textarea {
667 667 width: 100%;
668 668 float: right;
669 669 }
  670 +
  671 + .table-responsive > .table > tbody > tr > td
  672 + {
  673 + white-space: normal !important;
  674 + }
670 675 }
671 676  
672 677 @media (max-width: 1023px) {
... ...