Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: KU-TheATeam/TheDreamTeamWS
base: 3cc2a11664
...
head fork: KU-TheATeam/TheDreamTeamWS
compare: 350c5a8d82
  • 1 commit
  • 11 files changed
  • 0 commit comments
  • 1 contributor
Commits on Oct 20, 2012
Mike Cutalo mcutalo88 better fucking work 350c5a8
22 AdminPages/Manager/Manager.aspx
View
@@ -19,26 +19,8 @@
<script src="../../SplitViewJS/jqm.page.params.js" type="text/javascript"></script>
<script src="../../jquery.ui.touch-punch.min.js" type="text/javascript"></script>
- <script type="text/javascript">
-
- $(document).bind('pageinit', function() {
- $( "#menuList" ).sortable();
- $( "#menuList" ).disableSelection();
- <!-- Refresh list to the end of sort to have a correct display -->
- $( "#menuList" ).bind( "sortstop", function(event, ui) {
- $('#menuList').listview('refresh');
- });
- });
- </script>
-
-
- <script type="text/javascript">
- function logout() {
- window.location.replace("../../logout.aspx");
- }
- </script>
-
-
+ <script src="../../js/MenuDrag.js" type="text/javascript"></script><!-- Drag and drop for menu-->
+ <script src="../../js/logout.js" type="text/javascript"></script><!--Logout-->
</head>
<body>
20 AdminPages/Manager/UpdateUser.aspx
View
@@ -17,24 +17,8 @@
<script src="../../SplitViewJS/iscroll.js" type="text/javascript"></script>
<script src="../../SplitViewJS/jqm.page.params.js" type="text/javascript"></script>
- <script type="text/javascript">
-
- $(document).bind('pageinit', function() {
- $( "#menuList" ).sortable();
- $( "#menuList" ).disableSelection();
- <!-- Refresh list to the end of sort to have a correct display -->
- $( "#menuList" ).bind( "sortstop", function(event, ui) {
- $('#menuList').listview('refresh');
- });
- });
- </script>
-
-
- <script type="text/javascript">
- function logout() {
- window.location.replace("../../logout.aspx");
- }
- </script>
+ <script src="../../js/MenuDrag.js" type="text/javascript"></script><!-- Drag and drop for menu-->
+ <script src="../../js/logout.js" type="text/javascript"></script><!--Logout-->
</head>
<body>
56 AdminPages/Supervisor/AddStep.aspx
View
@@ -8,7 +8,8 @@
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
<link href="../../SplitViewStyle/jquery.mobile.splitview.css" rel="stylesheet" type="text/css" />
<link href="../../SplitViewStyle/jquery.mobile.grids.collapsible.css" rel="stylesheet" type="text/css" />
-
+ <link href="../../StyleSheets/Style.css" rel="stylesheet" type="text/css" />
+
<script src="../../SplitViewJS/jquery-1.7.1.js" type="text/javascript"></script>
<script src="http://code.jquery.com/ui/1.8.21/jquery-ui.min.js" type="text/javascript"></script>
<script src="../../SplitViewJS/jquery.mobile.splitview.js" type="text/javascript"></script>
@@ -18,52 +19,9 @@
<script src="../../SplitViewJS/jqm.page.params.js" type="text/javascript"></script>
<script src="../../jquery.ui.touch-punch.min.js" type="text/javascript"></script>
-
-
- <style type="text/css">
- .font{
- font-size: 16px;
- }
- .align{
-
- font-size: 16px;
- }
- .alignPic{
-
- font-size: 16px;
- }
- .alignCata{
-
- }
-
- </style>
- <script type="text/javascript">
- $(document).bind('pageinit', function() {
- $( "#menuList" ).sortable();
- $( "#menuList" ).disableSelection();
- <!-- Refresh list to the end of sort to have a correct display -->
- $( "#menuList" ).bind( "sortstop", function(event, ui) {
- $('#menuList').listview('refresh');
- });
- });
- </script>
- <script type="text/javascript">
- $(document).bind('pageinit', function() {
- $( "#stepList" ).sortable();
- $( "#stepList" ).disableSelection();
- <!-- Refresh list to the end of sort to have a correct display -->
- $( "#stepList" ).bind( "sortstop", function(event, ui) {
- $('#stepList').listview('refresh');
- });
- });
- </script>
-
- <script type="text/javascript">
- function logout() {
- window.location.replace("../../logout.aspx");
- }
- </script>
-
+ <script src="../../js/MenuDrag.js" type="text/javascript"></script><!-- Drag and drop for menu-->
+ <script src="../../js/SortSteps.js" type="text/javascript"></script><!-- Drag and drop for steps-->
+ <script src="../../js/logout.js" type="text/javascript"></script><!--logout-->
</head>
<body>
@@ -126,8 +84,8 @@
<div data-role="panel" data-theme="b" data-id="main" ><!-- START OF RIGHT PANEL -->
<div data-role="page" id="newTask"><!-- START OF NEW TASK PAGE -->
- <div data-role="header" data-theme="b">
- <h1>Add Main Step</h1>
+ <div runat = "server" id = "Tasklabel" data-role="header" data-theme="b">
+ <h1 runat = "server" id = "header" ></h1>
</div>
<div data-role="content" data-theme="b" id="mainContent">
22 AdminPages/Supervisor/AddStep.aspx.cs
View
@@ -4,6 +4,10 @@
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using System.Configuration;
+using System.Data.SqlClient;
+using System.Data.Sql;
+using System.Data;
using System.IO;
public partial class AdminPages_AddStep : System.Web.UI.Page
@@ -12,8 +16,26 @@ public partial class AdminPages_AddStep : System.Web.UI.Page
protected void Page_Load(object sender, EventArgs e)
{
+ String name;
taskID = Convert.ToInt16(Request.QueryString["TaskID"]);
+ String connectionString = ConfigurationManager.AppSettings["ConnectionString"];
+ SqlDataReader reader;
+ SqlConnection sqlConnect = new SqlConnection(connectionString);
+ SqlCommand cmd = new SqlCommand();
+ cmd.Connection = sqlConnect;
+ cmd.CommandText = "retrieve_alltaskinfo";
+ cmd.CommandType = CommandType.StoredProcedure;
+ cmd.Parameters.Add("@taskid", SqlDbType.Int).Value = taskID;
+ sqlConnect.Open();
+ cmd.ExecuteNonQuery();
+ reader = cmd.ExecuteReader();
+ while (reader.Read())
+ {
+ name = reader["TaskName"].ToString();
+ header.InnerText = " Add Main Step for Task - " + name;
+ }
+
if ((Session["status"] == null || Session["status"] == "admin" || Session["status"] == "user"))
{
Response.Redirect("~/Default.aspx");
24 AdminPages/Supervisor/CreateTask.aspx
View
@@ -8,7 +8,8 @@
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
<link href="../../SplitViewStyle/jquery.mobile.splitview.css" rel="stylesheet" type="text/css" />
<link href="../../SplitViewStyle/jquery.mobile.grids.collapsible.css" rel="stylesheet" type="text/css" />
-
+ <link href="../../StyleSheets/Style.css" rel="stylesheet" type="text/css" />
+
<script src="../../SplitViewJS/jquery-1.7.1.js" type="text/javascript"></script>
<script src="http://code.jquery.com/ui/1.8.21/jquery-ui.min.js" type="text/javascript"></script>
<script src="../../SplitViewJS/jquery.mobile.splitview.js" type="text/javascript"></script>
@@ -17,24 +18,9 @@
<script src="../../SplitViewJS/iscroll.js" type="text/javascript"></script>
<script src="../../SplitViewJS/jqm.page.params.js" type="text/javascript"></script>
<script src="../../jquery.ui.touch-punch.min.js" type="text/javascript"></script>
-
-
- <script type="text/javascript">
- $(document).bind('pageinit', function() {
- $( "#menuList" ).sortable();
- $( "#menuList" ).disableSelection();
- <!-- Refresh list to the end of sort to have a correct display -->
- $( "#menuList" ).bind( "sortstop", function(event, ui) {
- $('#menuList').listview('refresh');
- });
- });
- </script>
-
- <script type="text/javascript">
- function logout() {
- window.location.replace("../../logout.aspx");
- }
- </script>
+
+ <script src="../../js/MenuDrag.js" type="text/javascript"></script><!-- Drag and drop for menu-->
+ <script src="../../js/logout.js" type="text/javascript"></script><!--logout-->
</head>
<body>
15 AdminPages/Supervisor/EditMainStep.aspx
View
@@ -9,8 +9,10 @@
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
<link href="../../SplitViewStyle/jquery.mobile.splitview.css" rel="stylesheet" type="text/css" />
<link href="../../SplitViewStyle/jquery.mobile.grids.collapsible.css" rel="stylesheet" type="text/css" />
-
+ <link href="../../StyleSheets/Style.css" rel="stylesheet" type="text/css" />
+
<script src="../../SplitViewJS/jquery-1.7.1.js" type="text/javascript"></script>
+ <script src="http://code.jquery.com/ui/1.8.21/jquery-ui.min.js" type="text/javascript"></script>
<script src="../../SplitViewJS/jquery.mobile.splitview.js" type="text/javascript"></script>
<script src="../../SplitViewJS/jquery.mobile.js" type="text/javascript"></script>
<script src="../../SplitViewJS/iscroll-wrapper.js" type="text/javascript"></script>
@@ -18,13 +20,10 @@
<script src="../../SplitViewJS/jqm.page.params.js" type="text/javascript"></script>
- <script src="../../js/PopulateEditMainStep.js" type="text/javascript"></script>
-
- <script type="text/javascript">
- function logout() {
- window.location.replace("../../logout.aspx");
- }
- </script>
+ <script src="../../js/PopulateEditMainStep.js" type="text/javascript"></script><!-- Populate page data -->
+ <script src="../../js/MenuDrag.js" type="text/javascript"></script><!-- Drag and drop for menu-->
+ <script src="../../js/SortSteps.js" type="text/javascript"></script><!-- Drag and drop for steps-->
+ <script src="../../js/logout.js" type="text/javascript"></script><!--logout-->
</head>
<body>
37 AdminPages/Supervisor/EditTask.aspx
View
@@ -8,7 +8,8 @@
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
<link href="../../SplitViewStyle/jquery.mobile.splitview.css" rel="stylesheet" type="text/css" />
<link href="../../SplitViewStyle/jquery.mobile.grids.collapsible.css" rel="stylesheet" type="text/css" />
-
+ <link href="../../StyleSheets/Style.css" rel="stylesheet" type="text/css" />
+
<script src="../../SplitViewJS/jquery-1.7.1.js" type="text/javascript"></script>
<script src="http://code.jquery.com/ui/1.8.21/jquery-ui.min.js" type="text/javascript"></script>
<script src="../../SplitViewJS/jquery.mobile.splitview.js" type="text/javascript"></script>
@@ -18,39 +19,11 @@
<script src="../../SplitViewJS/jqm.page.params.js" type="text/javascript"></script>
<script src="../../jquery.ui.touch-punch.min.js" type="text/javascript"></script>
- <!-- Yeah yo scripts -->
<script src="../../js/GetTaskInfo.js" type="text/javascript"></script>
<script src="../../js/GetMainStepInfo.js" type="text/javascript"></script>
-
-
- <script type="text/javascript">
- $(document).bind('pageinit', function() {
-
- $( "#menuList" ).sortable();
- $( "#menuList" ).disableSelection();
- <!-- Refresh list to the end of sort to have a correct display -->
- $( "#menuList" ).bind( "sortstop", function(event, ui) {
- $('#menuList').listview('refresh');
- });
- });
- </script>
-
- <script type="text/javascript">
- $(document).bind('pageinit', function() {
- $( "#stepList" ).sortable();
- $( "#stepList" ).disableSelection();
- <!-- Refresh list to the end of sort to have a correct display -->
- $( "#stepList" ).bind( "sortstop", function(event, ui) {
- $('#stepList').listview('refresh');
- });
- });
- </script>
-
- <script type="text/javascript">
- function logout() {
- window.location.replace("../../logout.aspx");
- }
- </script>
+ <script src="../../js/MenuDrag.js" type="text/javascript"></script><!-- Drag and drop for menu-->
+ <script src="../../js/SortSteps.js" type="text/javascript"></script><!-- Drag and drop for steps-->
+ <script src="../../js/logout.js" type="text/javascript"></script><!--logout-->
</head>
<body>
40 AdminPages/Supervisor/Supervisor.aspx
View
@@ -9,7 +9,8 @@
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
<link href="../../SplitViewStyle/jquery.mobile.splitview.css" rel="stylesheet" type="text/css" />
<link href="../../SplitViewStyle/jquery.mobile.grids.collapsible.css" rel="stylesheet" type="text/css" />
-
+ <link href="../../StyleSheets/Style.css" rel="stylesheet" type="text/css" />
+
<script src="../../SplitViewJS/jquery-1.7.1.js" type="text/javascript"></script>
<script src="http://code.jquery.com/ui/1.8.21/jquery-ui.min.js" type="text/javascript"></script>
<script src="../../SplitViewJS/jquery.mobile.splitview.js" type="text/javascript"></script>
@@ -19,41 +20,8 @@
<script src="../../SplitViewJS/jqm.page.params.js" type="text/javascript"></script>
<script src="../../jquery.ui.touch-punch.min.js" type="text/javascript"></script>
- <style type="text/css">
- .font{
- font-size: 16px;
- }
- .align{
- margin-left: 157px;
- font-size: 16px;
- }
- .alignPic{
- margin-left: 150px;
- font-size: 16px;
- }
- .alignCata{
- margin-left: 200px;
- }
-
- </style>
-
- <script type="text/javascript">
- $(document).bind('pageinit', function() {
- $( "#menuList" ).sortable();
- $( "#menuList" ).disableSelection();
- <!-- Refresh list to the end of sort to have a correct display -->
- $( "#menuList" ).bind( "sortstop", function(event, ui) {
- $('#menuList').listview('refresh');
- });
- });
- </script>
-
- <script type="text/javascript">
- function logout() {
- window.location.replace("../../logout.aspx");
- }
- </script>
-
+ <script src="../../js/MenuDrag.js" type="text/javascript"></script><!-- Drag and drop for menu-->
+ <script src="../../js/logout.js" type="text/javascript"></script><!--logout-->
</head>
<body>
10 js/MenuDrag.js
View
@@ -0,0 +1,10 @@
+ /*Menu List sort*/
+ $(document).bind('pageinit', function() {
+
+ $( "#menuList" ).sortable();
+ $( "#menuList" ).disableSelection();
+ <!-- Refresh list to the end of sort to have a correct display -->
+ $( "#menuList" ).bind( "sortstop", function(event, ui) {
+ $('#menuList').listview('refresh');
+ });
+ });
9 js/SortSteps.js
View
@@ -0,0 +1,9 @@
+ /*Steps Sort*/
+ $(document).bind('pageinit', function() {
+ $( "#stepList" ).sortable();
+ $( "#stepList" ).disableSelection();
+ <!-- Refresh list to the end of sort to have a correct display -->
+ $( "#stepList" ).bind( "sortstop", function(event, ui) {
+ $('#stepList').listview('refresh');
+ });
+ });
4 js/logout.js
View
@@ -0,0 +1,4 @@
+/*LOGOUT*/
+function logout() {
+ window.location.replace("../../logout.aspx");
+}

No commit comments for this range

Something went wrong with that request. Please try again.