From 81d5c71cf3fd8e1773dd3d609d37cd2986f98600 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Tue, 26 Mar 2013 10:08:26 +0100 Subject: [PATCH 01/11] fixed documentation --- arangod/RestHandler/RestDocumentHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arangod/RestHandler/RestDocumentHandler.cpp b/arangod/RestHandler/RestDocumentHandler.cpp index 84a8a65956..fdd12e3e04 100644 --- a/arangod/RestHandler/RestDocumentHandler.cpp +++ b/arangod/RestHandler/RestDocumentHandler.cpp @@ -540,7 +540,7 @@ bool RestDocumentHandler::readDocument () { /// assert(response.code === 304); /// /// logJsonResponse(response); -// db._drop(cn); +/// db._drop(cn); /// @END_EXAMPLE_ARANGOSH_RUN /// /// Unknown document handle: From 95efb14e7fbc16064820bb8ab01a1ec82373a4d8 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Tue, 26 Mar 2013 10:09:11 +0100 Subject: [PATCH 02/11] generated file --- html/admin/js/client/bootstrap/module-internal.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/html/admin/js/client/bootstrap/module-internal.js b/html/admin/js/client/bootstrap/module-internal.js index 30ad9a367d..db3445f968 100644 --- a/html/admin/js/client/bootstrap/module-internal.js +++ b/html/admin/js/client/bootstrap/module-internal.js @@ -149,7 +149,7 @@ //////////////////////////////////////////////////////////////////////////////// internal.appendCurlRequest = function (appender) { - return function (method, url, body) { + return function (method, url, body, headers) { var response; var curl; @@ -183,6 +183,10 @@ curl += "-X " + method + " "; } + if (headers !== undefined && headers !== "") { + curl += "--header \'" + headers + "\' "; + } + if (body !== undefined && body !== "") { curl += "--data @- "; } From d74de62bc0d731c60179527e8f0cf4bf30c67a41 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Tue, 26 Mar 2013 10:19:09 +0100 Subject: [PATCH 03/11] added missing Doxygen aliases --- Documentation/arango.template.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/arango.template.in b/Documentation/arango.template.in index 54fdb04646..4b74c86777 100644 --- a/Documentation/arango.template.in +++ b/Documentation/arango.template.in @@ -221,7 +221,11 @@ ALIASES += \ "RESTQUERYPARAM{3}=@htmlonly
@endhtmlonly\1 (\2,\3)@htmlonly
@endhtmlonly" \ "RESTRETURNCODES=@htmlonly
Return Codes
@endhtmlonly" \ "RESTRETURNCODE{1}=@htmlonly
HTTP \1
@endhtmlonly" \ - "RESTDESCRIPTION=@htmlonly
Description
@endhtmlonly" + "RESTDESCRIPTION=@htmlonly
Description
@endhtmlonly" \ + "RESTURLPARAMETERS=@htmlonly
URL parameters
@endhtmlonly" \ + "RESTURLPARAM{3}=@htmlonly
URL parameter
@endhtmlonly" \ + "RESTHEADERPARAMETERS=@htmlonly
HTTP header parameters
@endhtmlonly" \ + "RESTHEADERPARAM{2}=@htmlonly
HTTP header
@endhtmlonly" # navigation ALIASES += \ From 3952d6c2ce56d3ca27bfcf374e1cee64f1f0cffa Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Tue, 26 Mar 2013 10:28:27 +0100 Subject: [PATCH 04/11] Admin-UI: Added the complete swagger output under applications/swagger --- html/admin/js/routers/router.js | 6 ++++- html/admin/js/templates/swaggerView.ejs | 13 +++++++++ html/admin/js/views/swaggerView.js | 36 +++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 html/admin/js/templates/swaggerView.ejs create mode 100644 html/admin/js/views/swaggerView.js diff --git a/html/admin/js/routers/router.js b/html/admin/js/routers/router.js index 0ae41eff68..5c99a46165 100644 --- a/html/admin/js/routers/router.js +++ b/html/admin/js/routers/router.js @@ -166,7 +166,11 @@ $(document).ready(function() { }, swagger: function() { - alert("Sorry not yet linked"); + if (this.swaggerView === undefined) { + this.swaggerView = new window.SwaggerView(); + } + this.swaggerView.render(); + this.naviView.selectMenuItem('applications-menu'); } }); diff --git a/html/admin/js/templates/swaggerView.ejs b/html/admin/js/templates/swaggerView.ejs new file mode 100644 index 0000000000..0225e7b9fa --- /dev/null +++ b/html/admin/js/templates/swaggerView.ejs @@ -0,0 +1,13 @@ + + +
+   +
+ +
+ +
\ No newline at end of file diff --git a/html/admin/js/views/swaggerView.js b/html/admin/js/views/swaggerView.js new file mode 100644 index 0000000000..6438dc04b3 --- /dev/null +++ b/html/admin/js/views/swaggerView.js @@ -0,0 +1,36 @@ +window.SwaggerView = Backbone.View.extend({ + + el: '#content', + template: new EJS({url: '/_admin/html/js/templates/swaggerView.ejs'}), + + initialize: function() { + window.swaggerUi = new SwaggerUi({ + discoveryUrl:"api-docs.json", + apiKey: false, + dom_id:"swagger-ui-container", + supportHeaderParams: true, + supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch', 'head'], + onComplete: function(swaggerApi, swaggerUi){ + if(console) { + console.log("Loaded SwaggerUI") + console.log(swaggerApi); + console.log(swaggerUi); + } + $('pre code').each(function(i, e) {hljs.highlightBlock(e)}); + }, + onFailure: function(data) { + if(console) { + console.log("Unable to Load SwaggerUI"); + console.log(data); + } + }, + docExpansion: "none" + }); + }, + + render: function(){ + $(this.el).html(this.template.render({})); + window.swaggerUi.load(); + return this; + } +}); From be44345907874f67dee01f9df5a1169096154bfa Mon Sep 17 00:00:00 2001 From: Thomas Richter Date: Tue, 26 Mar 2013 10:29:57 +0100 Subject: [PATCH 05/11] work in progress --- html/admin/img/swagger/logo_small.png | Bin 0 -> 770 bytes html/admin/img/swagger/throbber.gif | Bin 0 -> 9257 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 html/admin/img/swagger/logo_small.png create mode 100644 html/admin/img/swagger/throbber.gif diff --git a/html/admin/img/swagger/logo_small.png b/html/admin/img/swagger/logo_small.png new file mode 100644 index 0000000000000000000000000000000000000000..5496a65579ae903d4008f9d268fac422ef9d3679 GIT binary patch literal 770 zcmV+d1O5DoP)K11rQipnJ)eVnTSzHNF zN8ab&RhE5cC$$4FI-PZXx$pga@8yN)KS}L2Us~^y$(x-xioWbnFcV+~b9ig=!ft8Q z0RD+rpA8910Smyc0GviVUOPGiY6YM@-r6Nn8S&~cxHl27$l)-R$1(!Xx045RDy;_& zeXkG{;_#i9rz0B6149#Ddj=KM6MV^rTD%ylzGdCBX<^=^@I0X3SCR7OMbn}sUKdeF zKO-flaJa%@kJ27@Rod?J9=+Qx5|=PtG8n> zy~9rIu}+48M}FW5Bbqw3t#po?c?kmG!FX32W(dOjzTb+U@64MzHItoeB!M0Jcd}|E z>ekW`<~FjR_ZVVJkF|_htH&v!({Oad?xax?0K0sLwBY%nr46DpCmIIaa?@|Y&?n0q z@kJlMy`pE2HtEgASNd~xNzt$Kn7w#^Fy5oi`e$bUE*+f>Vk5z7=-2pj68afrqli$_ zvqe##5V?a)QU_-s9+s?mJYT5m`MQDRH4cYs^L1lCW;Dua5Ln9lG0BC@9DJQHA(}y&Z}$apb{kU zbezR}b^|O%6i+$BFsT3zqAe8wg9`vfiRp#{)z2bsJw`vBQL7Bt!IexM3$Hsf0tHK3 z+R=x{lR$K`s;7__?ASPW=3?*xgCpGaiadSEpoi0pw-_V#OXM8Ap{4qlG08x0ig9IY z3Ijqh(t1_=g#jocuqyJO=729e9OSiNDSrhR0Gc5G)(QGH?*IS*07*qoM6N<$f<~fU A82|tP literal 0 HcmV?d00001 diff --git a/html/admin/img/swagger/throbber.gif b/html/admin/img/swagger/throbber.gif new file mode 100644 index 0000000000000000000000000000000000000000..06393889242fb3ea9e0205fa84369ec7bb66d15a GIT binary patch literal 9257 zcmd^^X;@R|x`tQg5wbE8AV3mAn1TjmQ&en2CK8~ENEH<+P_)pZ24y2E+7O0>K^a6u zQ3;5MiU^7p6*M3qDk!2=YEcHMQ>nzEYP;R`e2C@r+U+?#XaC*&gKPcB#k$`o&;7mu zYNhYYXe|Uo84#4ZIko#rcU5K8*yFL{qT47O&^5fZH$ zVZ@%(l~vVHjnm;H@KL8@r%yUHoo;rbHI_4lIH(_nsTT>S2`DFOD~uCb9_dF4`#QgI zy7ldMcLs+A_s%|e1pRPrbX-tpeNP!9(IpMFTce`t_5U%lP99z%&i6`1d~ zWeM!Rxc50<+d$e^9LT`?B+aMK~apR zHm?q;p<7{wN2g|I^aGlSws;VP84j(z%aQwvAWv83Z$}p(% zZ^?2;gxg(ey_`V5J7{;!o;o;KslW@z5EP~JGs|U)J7dF&(ff#A=6vU?cGQ$-4+;Jf z-ggJEa!yStn`_EWvl)#yhm6XVs}UUbsi;+agri;mCfjH^Uy;lH+Zw^h)4N?oZgZz4 zJk(fTZ|Bi^;+s_M=~+d#vyoxEPzTlOS=mX@sbl*uRj>=MaMr}cFIY8i?UM61>86uB zV$DlOUCiUJwbzJMP@D$urzK|lL2-PC!p1l47V-ZG<5Ev0Z5h~Kx?`KOp7gkAjV93A z-Gc7MrlxTf?wF;CbNc@tCHJH{TB3c;#{SVu%97}tyAM2n&|9W_?qv}$*Jt*%7Yxb# zV0;d;7|lDEltJYS+U)#aiJO};?_Jyy_4%syQ(uy?-J-Yx-9O5nKRk@@XSS~X<(2u~ zV-LamWm~!iqtH9wkpf8mAXZhOD&L#aA_%)4h2M;1M5jt zIR>Us+%W-GXa_f^opKg=DSrAs)AXeRa;Hp0aC1OgbxQ%Qr_QvTleM1jkR!2mkcX$3 ztsR8~G9iqh(-FJ@F_rQBIYDXV_6s7G9SxaVF^laZqcx$!D97m|7t16j6@Jt6UdDRy49Qyvs|c>RuA|@b%}`*wU}2^7q;&Vtc6@lb zcXl)T!6nYDzmMJ~%n$KNXyNlCG)GkJ4!82;v6@d3>s5r~E+3!O?049JDr14Y^PeMI02R`0lJ^=oJ zYd|*u9|SU(j7hY?+<=(?fP*mtV*zFhOrz6%{VA?ozdm&(Jf^V zMfPZ?>l`mS3{Uq8IM;e!+1YjJy2!mzK$O|wPeU{*QSbs9m+@`f5KxO3PBnQ=%RsZg%go*fJ`*w9TL{-WgZVIA$!YV}3BRcfeXaR$x#b zW)Tpd#8E4)^MyYdkH;4_;ChJuw%n+Be7Ko4;w-nHvyo$d_0e-YiF78Df&)_)(}fcr_r0mPH(4RRYWIu+d@t0&Ss@O^s! zOKyX&13)%N@83r^;QsgN{rl(!0|RF1FA)b1{CRXAy&1ySz@>olPiR4r$aMdq&_=nK zq|cFs8phWJ1@%dZ-gXd{zDbTILD>)qEvH-NU*Rf1b2J1Ri79`rBFl@ z8E^0I)OqEi{pH(a24b9YPG;Kz@t-qZW;3Mpe`MRlmYx{7bH-XZ&`RQ7Rb^%}gc&X| zd}Q-FZf|RWxHU?PR!(C?80zu(^l>*h{#ulSiid(O!J(8P-41bNM3tnX@U6NS5yo0? zdcF)~xFE&+&|gZ$23dV5t~?$$&ymZ;F8j7GGMncGSsDo%>J`26=&l=X#rSKv_64;0 zr;k6no@=gV`P)K!=kaHl>q?!`X>(A;84tg^Md<`zA%qbRLby1Z=fn*ZRdNqs%Tq|3 zOt}lZu0q9oKJhgz&+^7PCt$=UFW=R*w?a1)ePoL*`R$Gxj?TU@12tTHsT$giHQU+sqf;fS0FpT!< z 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 Date: Tue, 26 Mar 2013 10:52:04 +0100 Subject: [PATCH 06/11] Fixed Swagger pathes to logos/icons --- html/admin/css/swagger/screen.css | 2 +- html/admin/index.html | 40 ++++++++++++++++++++++++------- html/admin/js/lib/swagger-ui.js | 2 +- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/html/admin/css/swagger/screen.css b/html/admin/css/swagger/screen.css index 36a6f9c779..4d3272186a 100644 --- a/html/admin/css/swagger/screen.css +++ b/html/admin/css/swagger/screen.css @@ -415,7 +415,7 @@ body #header a#logo { font-size: 1.5em; font-weight: bold; text-decoration: none; - background: transparent url(../images/logo_small.png) no-repeat left center; + background: transparent url(../../img/swagger/logo_small.png) no-repeat left center; padding: 20px 0 20px 40px; color: white; } diff --git a/html/admin/index.html b/html/admin/index.html index 523889a320..8dc66c349b 100644 --- a/html/admin/index.html +++ b/html/admin/index.html @@ -7,6 +7,11 @@ ArangoDB Web Interface + + + + + @@ -28,6 +33,9 @@ + + + @@ -52,24 +60,39 @@ - - - - - - + + + + + + + + + + + + + + + + + + - - + + + + + @@ -132,6 +155,7 @@ + diff --git a/html/admin/js/lib/swagger-ui.js b/html/admin/js/lib/swagger-ui.js index ae53297632..df2a4c1e73 100644 --- a/html/admin/js/lib/swagger-ui.js +++ b/html/admin/js/lib/swagger-ui.js @@ -637,7 +637,7 @@ function program11(depth0,data) { function program13(depth0,data) { - return "\n
\n \n \n \n
\n "; + return "\n
\n \n \n \n
\n "; } buffer += "\n
    \n
  • Date: Tue, 26 Mar 2013 11:27:08 +0100 Subject: [PATCH 09/11] Foxx: Default '/' to index.html --- Documentation/UserManual/Foxx.md | 2 ++ js/common/tests/shell-foxx.js | 12 +++++++++++- js/server/modules/org/arangodb/foxx.js | 11 +++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Documentation/UserManual/Foxx.md b/Documentation/UserManual/Foxx.md index 3d856fa8c1..c8e9e80a53 100644 --- a/Documentation/UserManual/Foxx.md +++ b/Documentation/UserManual/Foxx.md @@ -65,6 +65,8 @@ This will require the file `wolf.js` in the libs folder you have defined and mak ### Handling Requests +If you do not redefine it, all requests that go to the root of your application will be redirected to `index.html`. + #### FoxxApplication#head @copydetails JSF_foxx_application_head diff --git a/js/common/tests/shell-foxx.js b/js/common/tests/shell-foxx.js index f12c4ac2c9..3052120493 100644 --- a/js/common/tests/shell-foxx.js +++ b/js/common/tests/shell-foxx.js @@ -201,7 +201,7 @@ function SetRoutesFoxxApplicationSpec () { assertEqual(action.callback, myFuncString); }, - testStart: function () { + testStartAddsRequiresAndContext: function () { var myFunc = function () {}, routes = app.routingInfo.routes; @@ -217,6 +217,16 @@ function SetRoutesFoxxApplicationSpec () { assertEqual(app.routingInfo.routes[0].action.context, "myContext"); assertEqual(app.routingInfo.routes[0].action.requiresLibs.a, 1); assertEqual(app.routingInfo.routes[0].action.requiresModels.b, 2); + }, + + testStartAddsRequiresAndContext: function () { + app.get('/simple/route', function() {}); + app.start("myContext"); + + assertEqual(app.routingInfo.routes[1].url, "/"); + assertEqual(app.routingInfo.routes[1].action['do'], "org/arangodb/actions/redirectRequest"); + assertEqual(app.routingInfo.routes[1].action.options.permanently, true); + assertEqual(app.routingInfo.routes[1].action.options.destination, "index.html"); } }; } diff --git a/js/server/modules/org/arangodb/foxx.js b/js/server/modules/org/arangodb/foxx.js index f0c7ca4b58..60a3085c27 100644 --- a/js/server/modules/org/arangodb/foxx.js +++ b/js/server/modules/org/arangodb/foxx.js @@ -145,6 +145,17 @@ _.extend(FoxxApplication.prototype, { route.action.requiresModels = models; }); + this.routingInfo.routes.push({ + "url" : "/", + "action" : { + "do" : "org/arangodb/actions/redirectRequest", + "options" : { + "permanently" : true, + "destination" : "index.html" + } + } + }); + db._collection("_routing").save(this.routingInfo); }, From 175d1a43eff567b49b3b969909731c2ad2850de5 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Tue, 26 Mar 2013 12:41:04 +0100 Subject: [PATCH 10/11] WebFrontend: Fixed overwrite of p Element by Swagger css, causing several texts to be unreadable. --- html/admin/css/swagger/screen.css | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/html/admin/css/swagger/screen.css b/html/admin/css/swagger/screen.css index 4d3272186a..206352715b 100644 --- a/html/admin/css/swagger/screen.css +++ b/html/admin/css/swagger/screen.css @@ -138,12 +138,6 @@ div.heading_with_menu ul { height: 100px; } -p { - line-height: 1.4em; - padding: 0 0 10px 0; - color: #333333; -} - ol { margin: 0px 0 10px 0; padding: 0 0 0 18px; @@ -228,7 +222,6 @@ a.hider { strong { font-family: "Droid Sans", sans-serif; font-weight: bold; - font-weight: bold; } .code { @@ -397,7 +390,7 @@ form.fullwidth ol li.string input, form.fullwidth ol li.url input, form.fullwidt } body { - font-family: "Droid Sans", sans-serif; + /* font-family: "Droid Sans", sans-serif; */ } body #content_message { From e2068ece03ef9e71afbcc376c81a4d7cd35da708 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Tue, 26 Mar 2013 12:48:43 +0100 Subject: [PATCH 11/11] Admin Interface: Moved invisibility of Applications to CSS-file --- html/admin/css/navigationView.css | 4 ++++ html/admin/js/templates/navigationView.ejs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/html/admin/css/navigationView.css b/html/admin/css/navigationView.css index c75bac90c1..3d4e840f21 100644 --- a/html/admin/css/navigationView.css +++ b/html/admin/css/navigationView.css @@ -45,3 +45,7 @@ body, input, textarea, .page-title span, .pingback a.url { height: 34px; padding: 0 !important; } + +.applications-menu { + display: none; +} \ No newline at end of file diff --git a/html/admin/js/templates/navigationView.ejs b/html/admin/js/templates/navigationView.ejs index 63b66cbc5f..166222d44a 100644 --- a/html/admin/js/templates/navigationView.ejs +++ b/html/admin/js/templates/navigationView.ejs @@ -10,7 +10,7 @@