Commit 40ee918c9993810087fe9f4c2cd5378a45789ab0

Authored by Mitali Srivastava
1 parent ef481fa1

CI css issues

400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -43,7 +43,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -43,7 +43,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
43 angular.forEach($scope.selectedCIlistViewData, function (value, key) { 43 angular.forEach($scope.selectedCIlistViewData, function (value, key) {
44 $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage; 44 $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
45 45
46 - var $el = $('<div id=' + value._id + ' class="col-sm-3 col-lg-2" title = ' + value._Title + ' data-ng-click="openView($event)">' 46 + var $el = $('<div id=' + value._id + ' class="col-sm-3 col-md-2" title = ' + value._Title + ' data-ng-click="openView($event)">'
47 + '<div class="thumbnail" >' 47 + '<div class="thumbnail" >'
48 + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >' 48 + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
49 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); 49 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
@@ -71,7 +71,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -71,7 +71,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
71 } 71 }
72 72
73 $scope.showItem = function (id) { 73 $scope.showItem = function (id) {
74 - console.log(id); 74 + // console.log(id);
75 $scope.hiderow = true; 75 $scope.hiderow = true;
76 if ($scope.filterstring == false) { 76 if ($scope.filterstring == false) {
77 77
@@ -92,7 +92,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -92,7 +92,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
92 $scope.SelectedCISummary = SelectedCIthumbImage[0]._Summary; 92 $scope.SelectedCISummary = SelectedCIthumbImage[0]._Summary;
93 $scope.SelectedCIId = SelectedCIthumbImage[0]._id; 93 $scope.SelectedCIId = SelectedCIthumbImage[0]._id;
94 $scope.SelectedCITitle = SelectedCIthumbImage[0]._Title; 94 $scope.SelectedCITitle = SelectedCIthumbImage[0]._Title;
95 - alert($scope.SelectedCIImage + "\n" + $scope.SelectedCISummary); 95 + // alert($scope.SelectedCIImage + "\n" + $scope.SelectedCISummary);
96 } 96 }
97 else { 97 else {
98 if ($scope.searchCIlistViewData.length > 0) { 98 if ($scope.searchCIlistViewData.length > 0) {
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 <div class="row tab-content" style="padding-left:25px; width:99%"> 46 <div class="row tab-content" style="padding-left:25px; width:99%">
47 <div role="tabpanel" class="tab-pane active" id="grid-view"> 47 <div role="tabpanel" class="tab-pane active" id="grid-view">
48 </div> 48 </div>
49 - <div role="tabpanel" class="tab-pane" id="list-view"> 49 + <div role="tabpanel" class="tab-pane active" id="list-view">
50 <div class="col-sm-12 table-responsive well" style="padding-left:25px; width:99%;max-height:350px;overflow:auto"> 50 <div class="col-sm-12 table-responsive well" style="padding-left:25px; width:99%;max-height:350px;overflow:auto">
51 <table class="table table-hover table-fixed bg-white" style="padding-left:25px; width:100%;"> 51 <table class="table table-hover table-fixed bg-white" style="padding-left:25px; width:100%;">
52 <thead> 52 <thead>
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
1 -<div class="bodyWrap row"> 1 +<div class="bodyWrap row no-scroll">
2 <div ng-include=" 'app/widget/MainMenu.html' " /> 2 <div ng-include=" 'app/widget/MainMenu.html' " />
3 <div class="main"> 3 <div class="main">
4 - <div class="col-sm-12 stickey-area" style="padding-left:25px; width:99%"> 4 + <div class="col-sm-12 stickey-area" style="padding-left:19px; width:99%">
5 <div class="breadcrumb"> 5 <div class="breadcrumb">
6 <div class="row"> 6 <div class="row">
7 - <h4 class="text-center text-primary paddingbtm5">Display Image By</h4>  
8 - <div class="col-lg-2 col-sm-4"> 7 + <h5 class="text-center text-primary txt-white f15 paddingbtm5">Display Image By</h5>
  8 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
9 <div class="form-group"> 9 <div class="form-group">
10 - <h5 class="text-center text-primary paddingbtm5">Body Region</h5> 10 + <h6 class="text-center text-primary txt-white f11 paddingbtm5">Body Region</h6>
11 <select class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in CIAllBodyRegion track by item"> 11 <select class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in CIAllBodyRegion track by item">
12 <option value="">All</option> 12 <option value="">All</option>
13 </select> 13 </select>
14 </div> 14 </div>
15 </div> 15 </div>
16 - <div class="col-lg-2 col-sm-4"> 16 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
17 <div class="form-group"> 17 <div class="form-group">
18 - <h5 class="text-center text-primary paddingbtm5">Body System</h5> 18 + <h6 class="text-center text-primary txt-white f11 paddingbtm5">Body System</h6>
19 <select class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in CIAllBodySystem track by item"> 19 <select class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in CIAllBodySystem track by item">
20 <option value="">All</option> 20 <option value="">All</option>
21 </select> 21 </select>
22 </div> 22 </div>
23 </div> 23 </div>
24 24
25 - <div class="col-lg-2 col-sm-4"> 25 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
26 <div class="form-group"> 26 <div class="form-group">
27 - <h5 class="text-center text-primary paddingbtm5">View Orientation</h5> 27 + <h6 class="text-center text-primary txt-white f11 paddingbtm5">View Orientation</h6>
28 <select class="form-control input-sm" ng-model="query.selectedorientation" ng-options="item for item in CIAllOrientation track by item"> 28 <select class="form-control input-sm" ng-model="query.selectedorientation" ng-options="item for item in CIAllOrientation track by item">
29 <option value="">All</option> 29 <option value="">All</option>
30 </select> 30 </select>
31 </div> 31 </div>
32 </div> 32 </div>
33 - <div class="col-lg-2 col-sm-4"> 33 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
34 <div class="form-group"> 34 <div class="form-group">
35 - <h5 class="text-center text-primary paddingbtm5">Image Type</h5> 35 + <h6 class="text-center text-primary txt-white f11 paddingbtm5">Image Type</h6>
36 <select class="form-control input-sm" ng-model="query.selectedimagetype" ng-options="item for item in CIAllImageType track by item"> 36 <select class="form-control input-sm" ng-model="query.selectedimagetype" ng-options="item for item in CIAllImageType track by item">
37 <option value="">All</option> 37 <option value="">All</option>
38 </select> 38 </select>
39 </div> 39 </div>
40 </div> 40 </div>
41 - <div class="col-lg-2 col-sm-4"> 41 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
42 <div class="form-group"> 42 <div class="form-group">
43 - <h5 class="text-center text-primary paddingbtm5">Medical Speciality</h5> 43 + <h6 class="text-center text-primary txt-white f11 paddingbtm5">Medical Speciality</h6>
44 <select class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item"> 44 <select class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item">
45 <option value="">All</option> 45 <option value="">All</option>
46 </select> 46 </select>
47 </div> 47 </div>
48 </div> 48 </div>
49 - <div class="col-lg-2 col-sm-4"> 49 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
50 <div class="form-group"> 50 <div class="form-group">
51 - <h5 class="text-center text-primary paddingbtm5">Search</h5> 51 + <h6 class="text-center text-primary txt-white f11 paddingbtm5">Search</h6>
52 <button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button> 52 <button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>
53 </div> 53 </div>
54 - </div> 54 + </div>
55 </div> 55 </div>
56 </div> 56 </div>
57 </div> 57 </div>
58 58
59 59
60 - <div class="row tab-content" style="padding-left:25px; width:99%">  
61 - <div role="tabpanel" class="tab-pane active" id="grid-view">  
62 - <!--<div ng-if="!filterstring" ng-repeat="item in selectedCIlistViewData">  
63 - <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">  
64 - <div class="thumbnail">  
65 - <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">  
66 - <div class="caption">  
67 - <p>{{item._Title}}</p>  
68 - </div>  
69 - </div>  
70 - </div>  
71 - </div>  
72 -  
73 - <div ng-if="filterstring" ng-repeat="item in searchCIlistViewData">  
74 - <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">  
75 - <div class="thumbnail">  
76 - <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">  
77 - <div class="caption">  
78 - <p>{{item._Title}}</p>  
79 - </div>  
80 - </div>  
81 - </div>  
82 - </div>--> 60 + <div class="row tab-content" style="padding-left:25px; width:99%">
83 61
  62 + <div role="tabpanel" class="tab-pane active" id="grid-view" style="overflow-y:scroll; height:400px; clear:both;">
  63 + <!--<div ng-if="!filterstring" ng-repeat="item in selectedCIlistViewData">
  64 + <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">
  65 + <div class="thumbnail">
  66 + <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">
  67 + <div class="caption">
  68 + <p>{{item._Title}}</p>
  69 + </div>
84 </div> 70 </div>
  71 + </div>
  72 + </div>
85 73
86 - <div role="tabpanel" class="tab-pane" id="list-view">  
87 - <!--<div class="col-sm-12 table-responsive">-->  
88 - <div class="col-sm-12 table-responsive well" style="padding-left:25px; width:99%;max-height:350px;overflow:auto">  
89 - <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">-->  
90 - <table class="table table-hover table-fixed bg-white" style="padding-left:25px; width:100%;">  
91 - <thead>  
92 - <tr class="active">  
93 - <th>Title</th>  
94 - <th>Region</th>  
95 - <th>System</th>  
96 - <th>View</th>  
97 - <th>Type</th>  
98 - <th>Specialty</th>  
99 - </tr>  
100 - </thead>  
101 - <tbody ng-if="!filterstring">  
102 - <tr ng-repeat="item in selectedCIlistViewData" >  
103 - <td ng-click="showItem(item._id)">  
104 - {{item._Title}}  
105 - </td>  
106 - <td>  
107 - {{item._BodyRegion}}  
108 - </td>  
109 - <td>  
110 - {{item._BodySystem}}  
111 - </td>  
112 - <td>  
113 - {{item._ViewOrientation}}  
114 - </td>  
115 - <td>  
116 - {{item._ImageType}}  
117 - </td>  
118 - <td>  
119 - {{item._MedicalSpecialty}}  
120 - </td>  
121 - </tr>  
122 - </tbody>  
123 - <tbody ng-if="filterstring">  
124 - <tr ng-repeat="item in searchCIlistViewData">  
125 - <td ng-click="showItem(item._id)">  
126 - {{item._Title}}  
127 - </td>  
128 - <td>  
129 - {{item._BodyRegion}}  
130 - </td>  
131 - <td>  
132 - {{item._BodySystem}}  
133 - </td>  
134 - <td>  
135 - {{item._ViewOrientation}}  
136 - </td>  
137 - <td>  
138 - {{item._ImageType}}  
139 - </td>  
140 - <td>  
141 - {{item._MedicalSpecialty}}  
142 - </td>  
143 - </tr>  
144 - </tbody>  
145 - </table> 74 + <div ng-if="filterstring" ng-repeat="item in searchCIlistViewData">
  75 + <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">
  76 + <div class="thumbnail">
  77 + <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">
  78 + <div class="caption">
  79 + <p>{{item._Title}}</p>
146 </div> 80 </div>
147 - <div class="col-sm-12 well" ng-show=" hiderow" style="padding-left:25px;padding-top:10px;"> 81 + </div>
  82 + </div>
  83 + </div>-->
  84 +
  85 + </div>
  86 +
  87 + <div role="tabpanel" class="tab-pane" id="list-view">
  88 + <!--<div class="col-sm-12 table-responsive">-->
  89 + <div class="panel col-sm-12 table-responsive" style="padding-left:10px; padding-right:0; width:100%;">
  90 + <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">-->
  91 + <table class="table table-hover table-fixed bg-white table-txt12" style="padding-left:25px; width:100%;">
  92 + <thead class="clsthead">
  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>
  100 + </tr>
  101 + </thead>
  102 + <tbody ng-if="!filterstring" class="clstbody">
  103 + <tr id="{{item._id}}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCIlistViewData">
  104 + <td>
  105 + {{item._Title}}
  106 + </td>
  107 + <td>
  108 + {{item._BodyRegion}}
  109 + </td>
  110 + <td>
  111 + {{item._BodySystem}}
  112 + </td>
  113 + <td>
  114 + {{item._ViewOrientation}}
  115 + </td>
  116 + <td>
  117 + {{item._ImageType}}
  118 + </td>
  119 + <td>
  120 + {{item._MedicalSpecialty}}
  121 + </td>
  122 + </tr>
  123 + </tbody>
  124 + <tbody ng-if="filterstring" class="clstbody">
  125 + <tr ng-click="showItem(item._id)" ng-repeat="item in searchCIlistViewData">
  126 + <td>
  127 + {{item._Title}}
  128 + </td>
  129 + <td>
  130 + {{item._BodyRegion}}
  131 + </td>
  132 + <td>
  133 + {{item._BodySystem}}
  134 + </td>
  135 + <td>
  136 + {{item._ViewOrientation}}
  137 + </td>
  138 + <td>
  139 + {{item._ImageType}}
  140 + </td>
  141 + <td>
  142 + {{item._MedicalSpecialty}}
  143 + </td>
  144 + </tr>
  145 + </tbody>
  146 + </table>
  147 + </div>
  148 + <div class="col-sm-12" ng-show=" hiderow" style="padding-left:25px;padding-top:10px;">
  149 + <div class="row well">
148 <div title="{{SelectedCITitle}}" class="col-sm-3 col-lg-3 no-padding"> 150 <div title="{{SelectedCITitle}}" class="col-sm-3 col-lg-3 no-padding">
149 <div class="thumbnail no-margin"> 151 <div class="thumbnail no-margin">
150 <img id="{{SelectedCIId}}" src="{{SelectedCIthumbImage}}" alt="" title="{{SelectedCITitle}}" data-ng-click="openView($event)"> 152 <img id="{{SelectedCIId}}" src="{{SelectedCIthumbImage}}" alt="" title="{{SelectedCITitle}}" data-ng-click="openView($event)">
151 </div> 153 </div>
152 </div> 154 </div>
153 - <div class="col-sm-8 col-lg-8" style="padding-left:10px;"><p ng-bind-html="SelectedCISummary"></p></div>  
154 - </div> 155 + <div class="col-sm-9 col-lg-9" style="padding-left:10px;">
  156 + <p class="f11" ng-bind-html="SelectedCISummary"></p>
  157 + <button id="{{SelectedCIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)">Open</button>
  158 + </div>
  159 +
155 </div> 160 </div>
  161 +
  162 +
  163 + </div>
156 </div> 164 </div>
  165 + </div>
157 </div> 166 </div>
158 </div> 167 </div>
159 168
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
@@ -7,8 +7,10 @@ @@ -7,8 +7,10 @@
7 <!--<div class="pull-right paddTop4 ">--> 7 <!--<div class="pull-right paddTop4 ">-->
8 <div role="group" ng-show="showme" class="btn-group"> 8 <div role="group" ng-show="showme" class="btn-group">
9 <ul class="listgrid-view" role="tablist"> 9 <ul class="listgrid-view" role="tablist">
10 - <li role="presentation" class="active" title="Image View"><a href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab" class=""><i class=" fa fa-image"></i></a></li>  
11 - <li role="presentation" title="List View"><a href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab" class=""><i class="fa fa-list-alt"></i></a></li> 10 + <!--<li role="presentation" class="active" title="Image View"><a href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab" class="" ><i class=" fa fa-image"></i></a></li>
  11 + <li role="presentation" title="List View"><a href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab" class="" ><i class="fa fa-list-alt"></i></a></li>-->
  12 + <li role="presentation" class="active" title="Image View"><i class=" fa fa-image" href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab" ></i></li>
  13 + <li role="presentation" title="List View"><i class="fa fa-list-alt" href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab" ></i></li>
12 </ul> 14 </ul>
13 </div> 15 </div>
14 </div> 16 </div>
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -707,4 +707,33 @@ textarea { @@ -707,4 +707,33 @@ textarea {
707 background-color: #1B92D0; 707 background-color: #1B92D0;
708 border-color: #1B92D0; 708 border-color: #1B92D0;
709 color: #ffffff; 709 color: #ffffff;
  710 +}
  711 +
  712 +/*28-06-2016*/
  713 +
  714 +.txt-white{ color:#fff;}
  715 +.f11 {font-size:11px;}
  716 +.f15 {font-size:15px; font-weight:600;}
  717 +.pad-lftrgt3 {padding-left:2px; padding-right:2px;}
  718 +.table-txt12 tr th, .table-txt12 tr td {font-size:12px; padding:2px 8px !important; vertical-align:middle;}
  719 +
  720 +.clsthead tr {
  721 + display: block;
  722 + position: relative;
  723 +}
  724 +.clsthead tr th {
  725 + min-width: 180px;
  726 + text-align: left;
  727 +}
  728 +
  729 +.clstbody {
  730 + display: block;
  731 + height: 200px;
  732 + width: 100%;
  733 + overflow:auto;
  734 +}
  735 +
  736 +.clstbody tr td {
  737 + min-width: 180px;
  738 + text-align: left;
710 } 739 }
711 \ No newline at end of file 740 \ No newline at end of file