[open-ils-commits] r10182 - in branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb: controllers/acq templates/oils/default templates/oils/default/acq templates/oils/default/acq/receiving

svn at svn.open-ils.org svn at svn.open-ils.org
Tue Jul 29 22:12:56 EDT 2008


Author: djfiander
Date: 2008-07-29 22:12:50 -0400 (Tue, 29 Jul 2008)
New Revision: 10182

Added:
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/receiving.py
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/base.html
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html
Modified:
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html
Log:
barest stub layout for receiving materials. No real content yet.

Added: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/receiving.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/receiving.py	                        (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/receiving.py	2008-07-30 02:12:50 UTC (rev 10182)
@@ -0,0 +1,19 @@
+from oilsweb.lib.base import *
+import logging, pylons
+import oilsweb.lib.context, oilsweb.lib.util
+import oilsweb.lib.bib
+import oils.const, oils.utils.utils
+import osrf.net_obj
+
+import simplejson
+
+from osrf.ses import ClientSession
+from oils.event import Event
+from oils.org import OrgUtil
+from oilsweb.lib.request import RequestMgr
+
+class ReceivingController(BaseController):
+    
+    def process(self, **kwargs):
+        r = RequestMgr()
+        return r.render('acq/receiving/process.html')

Added: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/base.html	                        (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/base.html	2008-07-30 02:12:50 UTC (rev 10182)
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+<%inherit file='../base.html'/>
+<%def name='block_navigate()'>
+    <!--
+    <div id='oils-acq-picklist-nav-div'>
+        <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/po/search'>${_('PO Search')}</a></div>
+        <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/po/li_search'>${_('Lineitem Search')}</a></div>
+        <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/po/marc_upload'>${_('Load Order Record')}</a></div>
+    </div>
+    <script>setSelectedNavLink('oils-acq-picklist-nav-div');</script>
+    -->
+</%def>

Added: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html	                        (rev 0)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html	2008-07-30 02:12:50 UTC (rev 10182)
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+<!-- 
+ vim:ts=4:sw=4:et:ft=mako: 
+-->
+<%inherit file='base.html'/>
+<%namespace file='../../common/jubgrid.html' name='jubgrid'/>
+
+<%def name="block_js()">
+    ${parent.block_js()}
+</%def>
+<%def name="page_title()">${_('Receiving')}</%def>
+
+<%def name="block_content()">
+
+<div dojoType="dijit.layout.LayoutContainer" style="height:100%">
+    <div dojoType="dijit.layout.ContentPane" layoutAlign="top">
+	<h1>Receiving Processing</h1>
+    </div>
+</div>
+</%def>
+<!-- Local Variables: -->
+<!-- mmm-classes: html-js -->
+<!-- End: -->

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html	2008-07-30 02:09:10 UTC (rev 10181)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/menu.html	2008-07-30 02:12:50 UTC (rev 10182)
@@ -48,6 +48,19 @@
                         </div>
                     </div>
                 </div>
+                <!-- ==========================================================================
+                     Receiving SubMenu
+                    ========================================================================== -->
+		<div dojoType="dijit.PopupMenuItem"
+                     iconClass="dijitEditorIcon dijitEditorIconCopy">
+		    <span>Receiving</span>
+                     <div dojoType="dijit.Menu">
+                        <div dojoType="dijit.MenuItem" iconClass="dijitEditorIcon dijitEditorIconCopy"
+                            onClick="location.href = '${c.oils.core.prefix.value}/acq/receiving/process';">
+                            Receiving
+                        </div>
+                    </div>
+		</div>
             </div>
         </div>
 



More information about the open-ils-commits mailing list