Index: /4.0/enpraxis.educommons/trunk/enpraxis/educommons/profiles/default/actions.xml
===================================================================
--- /4.0/enpraxis.educommons/trunk/enpraxis/educommons/profiles/default/actions.xml	(revision 782)
+++ /4.0/enpraxis.educommons/trunk/enpraxis/educommons/profiles/default/actions.xml	(revision 783)
@@ -172,4 +172,7 @@
       </property>
       <property name="visible">True</property>            
+    </object>
+    <object name="studygroups">
+      <property name="visible">False</property>
     </object>
   </object>
Index: /4.0/enpraxis.educommons/trunk/enpraxis/educommons/profiles/default/propertiestool.xml
===================================================================
--- /4.0/enpraxis.educommons/trunk/enpraxis/educommons/profiles/default/propertiestool.xml	(revision 782)
+++ /4.0/enpraxis.educommons/trunk/enpraxis/educommons/profiles/default/propertiestool.xml	(revision 783)
@@ -26,5 +26,6 @@
       <element value="text/x-python"/>
       <element value="text/x-web-intelligent"/>
-  </property>
+    </property>
+    <property name="enable_livesearch" type="boolean">False</property>
   </object>
   <object name="educommons_properties" meta_type="Plone Property Sheet">
Index: 0/enpraxis.educommons/trunk/enpraxis/educommons/skins/eduCommons/search.pt
===================================================================
--- /4.0/enpraxis.educommons/trunk/enpraxis/educommons/skins/eduCommons/search.pt	(revision 782)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      lang="en"
-      metal:use-macro="here/main_template/macros/master"
-      i18n:domain="plone">
-
-<metal:block metal:fill-slot="head_slot">
-    <link rel="alternate" title="RSS 1.0" type="application/rss+xml"
-          tal:condition="request/SearchableText|nothing"
-          tal:attributes="href string:$here_url/search_rss?${request/QUERY_STRING}"/>
-</metal:block>
-
-<metal:block fill-slot="top_slot"
-             tal:define="dummy python:request.set('disable_border',1)" />
-
-<div metal:fill-slot="main"
-     tal:define="use_types_blacklist request/use_types_blacklist | python:True;
-                 use_navigation_root request/use_navigation_root | python:True;
-                 results python:here.queryCatalog(REQUEST=request,use_types_blacklist=use_types_blacklist, use_navigation_root=use_navigation_root);
-                 Batch python:modules['Products.CMFPlone'].Batch;
-                 b_size python:30;b_start python:0;b_start request/b_start | b_start;
-                 desc_length site_properties/search_results_description_length;
-                 desc_ellipsis site_properties/ellipsis;
-                 searchterm request/SearchableText|nothing;
-                 use_view_action site_properties/typesUseViewActionInListings|python:();
-		 search_view here/@@search_view">
-
-    <h1 class="documentFirstHeading"
-        i18n:translate="heading_search_results">Search results</h1>
-
-    <div tal:condition="not: results">
-        <p><strong i18n:translate="description_no_results_found">No results were found.</strong></p>
-    </div>
-
-    <p i18n:translate="search_results_advanced">
-    Did you not find what you were looking for? Try the
-    <span i18n:name="advanced_search">
-    <a href=""
-       i18n:translate="search_results_advanced_link"
-       tal:attributes="href string:$portal_url/search_form">Advanced Search</a>
-    </span>
-    for more precise search options.
-    </p>
-
-    <div tal:condition="results"
-          tal:define="batch python:Batch(results, b_size, int(b_start), orphan=1);">
-        <strong i18n:translate="batch_x_items_matching_your_criteria">
-            <span i18n:name="number" tal:omit-tag="" tal:content="python:len(results)">234</span> items matching your criteria.
-        </strong>
-
-        <tal:syndicate condition="syntool/isSiteSyndicationAllowed">
-        <a href="" tal:attributes="href string:$here_url/search_rss?${request/QUERY_STRING}">
-        <img i18n:domain="eduCommons" 
-	     i18n:attributes="title; alt;"
-             tal:attributes="src string:$portal_url/rss.gif"
-             src="rss.gif"
-             alt="RSS Feed"
-             title="RSS feed of these search results" />
-        </a>
-        </tal:syndicate>
-
-        <!-- Search results -->
-
-        <dl>
-        <tal:results repeat="result batch">
-        <tal:entry define="result_url result/getURL;
-                           result_type result/portal_type;
-                           item_icon python:plone_view.getIcon(result);
-                           url python:'%s?searchterm=%s'%(test(result_type in use_view_action, result_url+'/view', result_url+'/'), searchterm);
-			   obj python:result.getObject();
-	                   obj_parent obj/search_view/findEduParent">
-
-            <dt tal:define="item_wf_state_class string:state-${result/review_state};"
-                tal:attributes="class python:'contenttype-' + normalizeString(result.portal_type)">
-              <img tal:replace="structure item_icon/html_tag" />
-               <a
-                 href="#" 
-                 tal:attributes="href url;
-                                 class string:$item_wf_state_class"
-                 tal:content="result/pretty_title_or_id" />
-               <span class="discreet" 
-                     title="Relevance"
-                     tal:condition="result/data_record_normalized_score_"
-		     i18n:domain="eduCommons"
-                     i18n:attributes="title">
-                    [<span tal:content="result/data_record_normalized_score_"
-                           tal:omit-tag="">23%</span>%]
-               </span>
-
-                <span class="discreet" i18n:translate="results_by_author">
-                by <span tal:omit-tag="" tal:content="result/Creator" i18n:name="author">Author</span>,
-                <span tal:omit-tag="" tal:content="python:toLocalizedTime(result.ModificationDate, long_format=1)" i18n:name="date">Modification Date</span>
-                </span>
-
-   	<tal:block tal:condition="obj/search_view/isInEduContainer">
-	    <br />
- 	     <span class="discreet">From: 
-	       <a tal:content="obj_parent/title"
-		  tal:attributes="href obj_parent/absolute_url" />
-	     </span>
-	  </tal:block>
-
-            </dt>
-            
-            <dd tal:content="python:plone_view.cropText(result.Description, desc_length, desc_ellipsis)"> Description </dd>
-
-        </tal:entry>
-        </tal:results>
-        </dl>
-         
-        <!-- Navigation -->
-        <div metal:use-macro="here/batch_macros/macros/navigation" />
-
-    </div>
-</div>
-
-
-</html>
-
Index: 0/enpraxis.educommons/trunk/enpraxis/educommons/skins/eduCommons/search.pt.metadata
===================================================================
--- /4.0/enpraxis.educommons/trunk/enpraxis/educommons/skins/eduCommons/search.pt.metadata	(revision 782)
+++ 	(revision )
@@ -1,2 +1,0 @@
-[default]
-title=Search Results
Index: 0/enpraxis.educommons/trunk/enpraxis/educommons/skins/eduCommons/search_form.pt
===================================================================
--- /4.0/enpraxis.educommons/trunk/enpraxis/educommons/skins/eduCommons/search_form.pt	(revision 782)
+++ 	(revision )
@@ -1,249 +1,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      lang="en"
-      metal:use-macro="here/main_template/macros/master"
-      i18n:domain="plone">
-
-    <metal:head fill-slot="top_slot"
-                tal:define="dummy python:request.set('disable_border',1)" />
-    <metal:block fill-slot="column_one_slot" />
-    <metal:block fill-slot="column_two_slot" />
-
-<div metal:fill-slot="main">
-
-    <h1 class="documentFirstHeading"
-        i18n:translate="heading_advanced_search">Advanced search for content</h1>
-
-    <p i18n:translate="description_advanced_search">
-    This search form enables you to find content on the site by
-    specifying one or more search terms.
-    <br />
-    Remember that you can use the quick search anytime, it's normally
-    good enough, this search form is just if you want to be more specific.
-    </p>
-
-    <form action="search"
-          class="enableAutoFocus"
-          method="get"
-          name="search"
-          tal:define="DateTime python:modules['DateTime'].DateTime">
-
-        <fieldset>
-
-            <legend i18n:translate="legend_search_terms">Search Terms</legend>
-
-            <div class="field">
-                <label for="SearchableText" i18n:translate="label_search_text">Search Text</label>
-
-                <div class="formHelp" i18n:translate="help_search_text">
-                For a simple text search, enter your search term
-                here. Multiple words may be found by combining
-                them with <strong>AND</strong> and <strong>OR</strong>.
-                The text in this field will be matched with
-                items' contents, title and description.
-                </div>
-
-                <input type="text"
-                       id="SearchableText"
-                       name="SearchableText"
-                       size="25"
-                       tal:attributes="value request/SearchableText|nothing"
-                       />
-            </div>
-
-            <div class="field">
-                <label for="Title" i18n:translate="label_title">Title</label>
-
-                <div class="formHelp" i18n:translate="help_search_title">
-                Return items matching this title.
-                </div>
-
-                <input type="text"
-                       id="Title"
-                       name="Title"
-                       size="25"
-                       />
-            </div>
-
-            <div class="field">
-                <label for="Subject" i18n:translate="label_categories">Categories</label>
-
-                <div class="formHelp" i18n:translate="help_search_categories">
-                Return items matching some or all of these Categories.
-                Multiple words may be found by pressing <strong>Ctrl</strong>
-                (or <strong>Apple</strong> key on Mac) while clicking the
-                keywords.
-                </div>
-
-                <select name="Subject:list"
-                        id="Subject"
-                        size="7"
-                        multiple="multiple"
-                        tal:define="contentSubjects here/Subject;
-                                    usedSubjects python:here.portal_catalog.uniqueValuesFor('Subject');"
-                        >
-                    <option value="#"
-                            tal:repeat="subject usedSubjects"
-                            tal:content="subject"
-                            tal:attributes="value subject"
-                            i18n:domain="plone-metadata"
-                            i18n:translate=""
-                            >dummy</option>
-                </select>
-                <br />
-
-                <input type="radio"
-                       name="Subject_usage:ignore_empty"
-                       id="Subject_or"
-                       value=""
-                       class="noborder"
-                       tal:attributes="checked python:1"/>
-                    <label for="Subject_or" i18n:translate="description_subject_or">
-                        Match any
-                    </label>
-                    <br />
-
-                <input type="radio"
-                        name="Subject_usage:ignore_empty"
-                        id="Subject_and"
-                        value="operator:and"
-                        class="noborder"
-                        tal:attributes="checked python:0"/>
-                <label for="Subject_and" i18n:translate="description_subject_and">
-                    Match all
-                </label>
-            </div>
-    
-            <div class="field">
-                <label for="Description" i18n:translate="label_description">Description</label>
-
-                <div class="formHelp" i18n:translate="help_search_description">
-                Return items matching this description.
-                Multiple words may be found
-                by combining them with <strong>AND</strong> and <strong>OR</strong>.
-                </div>
-    
-                <input type="text"
-                       id="Description"
-                       name="Description"
-                       size="25"
-                       />
-            </div>
-    
-            <div class="field">
-                <label for="created" i18n:translate="label_new_items_since">New items since</label>
-
-                <div class="formHelp" i18n:translate="help_search_new_items_since">
-                Return items added since you were last logged on, the last week, etc.
-                </div>
-    
-                <tal:datetime define="today python:DateTime().earliestTime()">
-                <select name="created:list:date"
-                        id="created"
-                        tal:define="yesterday python:(today-1).Date();
-                                    lastweek python:(today-7).Date();
-                                    lastmonth python:(today-31).Date();
-                                    ever string:1970/02/01;">
-                    <option value="#"
-                            tal:condition="not: isAnon"
-                            tal:attributes="value python:member is not None and member.getProperty('last_login_time') or today"
-                            i18n:translate="last_login">Last log-in</option>
-                    <option value="#" tal:attributes="value yesterday" i18n:translate="time_yesterday"> Yesterday </option>
-                    <option value="#" tal:attributes="value lastweek" i18n:translate="time_last_week"> Last week </option>
-                    <option value="#" tal:attributes="value lastmonth" i18n:translate="time_last_month"> Last month </option>
-                    <option value="#" tal:attributes="value ever" selected="selected" i18n:translate="time_ever"> Ever </option>
-                </select>
-                </tal:datetime>
-
-                <input type="hidden" name="created_usage" value="range:min" />
-            </div>
-    
-            <div class="field" tal:define="portal_types portal/portal_types;">
-                <label i18n:translate="label_item_type">Item type</label>
-
-                <div class="formHelp" i18n:translate="help_search_item_type">
-                Return items of a specific type.
-                </div>
-    
-                <span class="optionsToggle">
-                    <input type="checkbox"
-                           onclick="javascript:toggleSelect(this, 'portal_type:list', true);"
-                           name="pt_toggle"
-                           value="#"
-                           id="pt_toggle"
-                           class="noborder"
-                           checked="checked" />
-                    <label for="pt_toggle"
-                           i18n:translate="label_toggle"
-                           >Select All/None
-                    </label>
-                </span>
-                <br />
-                <div style="float:left; margin-right: 2em;"
-                     tal:define="allTypes python:putils.getUserFriendlyTypes();
-                             typeLists python:here.createMultiColumnList(allTypes, numCols=2, sort_on='self');"
-                     tal:repeat="sublist typeLists">
-                    <tal:items repeat="type sublist">
-                    <input type="checkbox"
-                           name="portal_type:list"
-                           value="#"
-                           class="noborder"
-                           checked="checked"
-                           tal:attributes="value type;
-                                           id string:portal_type_${repeat/sublist/number}_${repeat/type/number}"/>
-                    <label for=""
-                           i18n:translate=""
-                           tal:attributes="for string:portal_type_${repeat/sublist/number}_${repeat/type/number}"
-                           tal:content="python: portal_types.getTypeInfo(type).Title()"
-                           />
-                    <br />
-                    </tal:items>
-                </div>
-            </div>
-
-            <div class="visualClear" id="clear-space-before-author"><!-- --></div>
-            <br />
-
-            <div class="field">
-                <label for="Creator" i18n:translate="label_author">Author</label>
-
-                <div class="formHelp" i18n:translate="help_search_author">
-                Return items created by a particular person.
-                </div>
-    
-                <tal:creators tal:define="creators python:portal.portal_catalog.uniqueValuesFor('Creator')">
-                    <select name="Creator"
-                            id="Creator"
-                            tal:condition="python: len(creators) &lt;= 30">
-                        <option value="" i18n:translate="label_any_author">Any Author</option>
-                        <metal:block tal:repeat="creator creators">
-                            <option value="" tal:attributes="value creator" tal:content="creator"> username </option>
-                        </metal:block>
-                    </select>
-    
-                    <input name="Creator"
-                           tal:condition="python: len(creators) &gt; 30 " />
-                </tal:creators>
-            </div>
-    
-
-            <div class="visualClear" id="clear-space-before-submit"><!-- --></div>
-
-            <div class="formControls">
-                <input class="context"
-                       type="submit"
-                       name="submit"
-                       value="Search"
-                       i18n:attributes="value label_search;"
-                       />
-            </div>
-
-        </fieldset>
-    
-    </form>
-
-</div>
-
-</html>
Index: 0/enpraxis.educommons/trunk/enpraxis/educommons/skins/eduCommons/search_form.pt.metadata
===================================================================
--- /4.0/enpraxis.educommons/trunk/enpraxis/educommons/skins/eduCommons/search_form.pt.metadata	(revision 782)
+++ 	(revision )
@@ -1,2 +1,0 @@
-[default]
-title=Advanced Search
