embedded iframe for search; show/hide workbench menu button

Author: taleksashina

src/main/webapp/i18n/resources-locale_en.json

@@ -1974,5 +1974,17 @@
         "key":"_thesaurus-manager-warning_",
         "value":"Do only touch the functionality if you are knowing what you are doing.",
         "description":"message shown on thesaurus management page (warning - only for advanced users)"
+    },
+
+
+    {
+        "key":"_show-stack-menu_",
+        "value":"Show Menu",
+        "description":"show stack menu button name"
+    },
+    {
+        "key":"_hide-stack-menu_",
+        "value":"Hide Menu",
+        "description":"hide stack menu button name"
     }
 ]

src/main/webapp/i18n/resources-locale_ru.json

@@ -1972,6 +1972,18 @@
         "key":"_thesaurus-manager-warning_",
         "value":"Используйте данные функции только если знаете, что вы делаете.",
         "description":"message shown on thesaurus management page (warning - only for advanced users)"
+    },
+
+
+    {
+        "key":"_show-stack-menu_",
+        "value":"Показать меню",
+        "description":"show stack menu button name"
+    },
+    {
+        "key":"_hide-stack-menu_",
+        "value":"Скрыть меню",
+        "description":"hide stack menu button name"
     }
 
 ]

src/main/webapp/js/app.js

@@ -62,7 +62,7 @@ app.config(function($routeSegmentProvider, $routeProvider)
      /*   .when('/home/search-querying-and-exploration/googlemap', 'default.googlemap') */
 //        .when('/home/search-querying-and-exploration/facete', 'default.facete')
 //        .when('/home/search-querying-and-exploration/mappify', 'default.mappify')
-//        .when('/home/querying-and-exploration/search', 'default.search')
+        .when('/home/search-querying-and-exploration/search', 'default.search')
 //        .when('/home/manual-revision-and-authoring/ontowiki', 'default.ontowiki')
         .when('/home/manual-revision-and-authoring/edit-uploads', 'default.edit-uploads')
 //        .when('/home/linking-and-fusing/limes', 'default.limes')

src/main/webapp/js/controllers.js

@@ -8,6 +8,24 @@ function AccountMenuCtrl($scope) {
     { name: "_user-pref_",   route:'#/account/preferences', url:'/account/preferences' }];
 }
 
+function WorkbenchCtrl($scope) {
+    $scope.showStackMenu = true;
+    $scope.toggleButtonName = "_hide-stack-menu_";
+
+    $scope.toggleStackMenu = function() {
+        $scope.showStackMenu = !$scope.showStackMenu;
+        if ($scope.showStackMenu) {
+            $('#segment1').removeClass('col-xs-12');
+            $('#segment1').addClass('col-xs-10');
+            $scope.toggleButtonName = "_hide-stack-menu_";
+        } else {
+            $('#segment1').removeClass('col-xs-10');
+            $('#segment1').addClass('col-xs-12');
+            $scope.toggleButtonName = "_show-stack-menu_";
+        }
+    };
+}
+
 function StackMenuCtrl($scope, ConfigurationService, localize, AccountService, $window, flash, DocumentsService) {
     var services = ConfigurationService.getComponentServices(":Solr");
 	var searchServiceUrl = services[0].serviceUrl;
@@ -37,7 +55,8 @@ function StackMenuCtrl($scope, ConfigurationService, localize, AccountService, $
 //		       {name: 'Virtuoso', route:'#/home/search-querying-and-exploration/virtuoso', url:'/home/search-querying-and-exploration/virtuoso' },
 //		       {name: 'Facete', route:'#/home/search-querying-and-exploration/facete', url:'/home/search-querying-and-exploration/facete' },
 //		       {name: 'Mappify', route:'#/home/search-querying-and-exploration/mappify', url:'/home/search-querying-and-exploration/mappify' },
-		       {name: '_search_', route:null, url:searchServiceUrl, modaltitle:'_faceted-search_', requiredServices:[":SearchService"] }]
+//		       {name: '_search_', route:null, url:searchServiceUrl, modaltitle:'_faceted-search_', requiredServices:[":SearchService"] },
+		       {name: '_search_', route:'#/home/search-querying-and-exploration/search', url:'/home/search-querying-and-exploration/search', requiredServices:[":SearchService"] }]
 		    },
 	    {
 	      title: "_man-revision-authoring_",

src/main/webapp/js/workbench/default.html

@@ -1,5 +1,6 @@
-  <div class="contents">
-  	<div class="col-xs-2 sidebar">
+  <div class="contents" ng-controller="WorkbenchCtrl">
+      <button class="btn btn-primary btn-large" ng-click="toggleStackMenu()" data-i18n="{{toggleButtonName}}"></button>
+  	<div class="col-xs-2 sidebar" ng-show="showStackMenu">
 
 			<div class="panel-group" id="accordion" ng-controller="StackMenuCtrl">
 			  <div class="panel panel-default" ng-repeat="group in groups | filter:showGroup">
@@ -37,7 +38,7 @@ <h5 class="modal-title green bold" data-i18n="{{modaltitle}}"></h5>
 
 		</div>
 
-	  <div class="col-xs-10 contents" app-view-segment="1">
+	  <div id="segment1" class="col-xs-10 contents" app-view-segment="1">
 	  	<div class="col-xs-8">
  		<h3 class="green bold" data-i18n="_home-title_"></h3>
  		<br>

src/main/webapp/js/workbench/search-querying-and-exploration/search-controller.js

@@ -4,10 +4,7 @@ var SearchCtrl = function($scope, ConfigurationService) {
     var services = ConfigurationService.getComponentServices(":Solr");
 	var searchServiceUrl = services[0].serviceUrl;
 
-    $scope.url = "";
-	$scope.setUrl = function(){
-	    $scope.url= searchServiceUrl;
-	};
+    $scope.url = searchServiceUrl;
 
     $scope.close = function(modalID) {
         $(modalID).modal('hide');

src/main/webapp/js/workbench/search-querying-and-exploration/search.html

@@ -1,6 +1,9 @@
 <div ng-controller="SearchCtrl">
     <h3 class="green bold" data-i18n="_search_"></h3>
-    <button type="button" class="btn btn-primary btn-large" data-toggle="modal" ng-click="setUrl(); openModal();">Open Solr</button>
+
+    <iframe id="searchFrame" frameborder="0" style="width:100%; height:1400px" src="{{url}}"></iframe>
+
+    <!--button type="button" class="btn btn-primary btn-large" data-toggle="modal" ng-click="openModal();">Open Solr</button>
 
     <div class="modal" id="fullModal">
         <div class="modal-content">
@@ -12,5 +15,5 @@ <h5 class="modal-title green bold" data-i18n="_faceted-search_"></h5>
                 <modal-iframe></modal-iframe>
             </div>
         </div>
-    </div>
+    </div-->
 </div>